public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-db/qdbm/, dev-db/qdbm/files/
@ 2017-03-30 14:32 Akinori Hattori
  0 siblings, 0 replies; 3+ messages in thread
From: Akinori Hattori @ 2017-03-30 14:32 UTC (permalink / raw
  To: gentoo-commits

commit:     b64dfb87139e61279882f7a0c1d498bcdaf88919
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 30 14:26:43 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 14:26:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b64dfb87

dev-db/qdbm: fix build

Gentoo-Bug: 584998

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-db/qdbm/files/qdbm-configure.patch | 108 +++++++++++++++++++++++++++++++++
 dev-db/qdbm/qdbm-1.8.78-r1.ebuild      |  14 ++++-
 2 files changed, 121 insertions(+), 1 deletion(-)

diff --git a/dev-db/qdbm/files/qdbm-configure.patch b/dev-db/qdbm/files/qdbm-configure.patch
new file mode 100644
index 00000000000..364c5c9f653
--- /dev/null
+++ b/dev-db/qdbm/files/qdbm-configure.patch
@@ -0,0 +1,108 @@
+--- a/cgi/configure.in
++++ b/cgi/configure.in
+@@ -13,15 +13,6 @@
+ # Export variables
+ TARGETS="all"
+ 
+-# Building paths
+-pathtmp="$PATH"
+-PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
+-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
+-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
+-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
+-CPATH="$HOME/include:/usr/local/include:$CPATH"
+-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH
+-
+ 
+ 
+ #================================================================
+--- a/configure.in
++++ b/configure.in
+@@ -20,15 +20,6 @@
+ LD="ld"
+ AR="ar"
+ 
+-# Building paths
+-pathtmp="$PATH"
+-PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
+-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
+-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
+-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
+-CPATH="$HOME/include:/usr/local/include:$CPATH"
+-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH
+-
+ 
+ 
+ #================================================================
+--- a/java/configure.in
++++ b/java/configure.in
+@@ -25,15 +25,6 @@
+ MYOPTS=""
+ LD="ld"
+ 
+-# Building paths
+-pathtmp="$PATH"
+-PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
+-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
+-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
+-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
+-CPATH="$HOME/include:/usr/local/include:$CPATH"
+-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH
+-
+ 
+ 
+ #================================================================
+--- a/perl/configure.in
++++ b/perl/configure.in
+@@ -5,15 +5,6 @@
+ # Targets
+ AC_INIT(qdbm-perl, 1.0.0)
+ 
+-# Building paths
+-pathtmp="$PATH"
+-PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
+-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
+-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
+-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
+-CPATH="$HOME/include:/usr/local/include:$CPATH"
+-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH
+-
+ # Setting the default prefix
+ if test "$prefix" = NONE
+ then
+--- a/plus/configure.in
++++ b/plus/configure.in
+@@ -19,15 +19,6 @@
+ LD="ld"
+ AR="ar"
+ 
+-# Building paths
+-pathtmp="$PATH"
+-PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
+-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
+-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
+-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
+-CPATH="$HOME/include:/usr/local/include:$CPATH"
+-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH
+-
+ 
+ 
+ #================================================================
+--- a/ruby/configure.in
++++ b/ruby/configure.in
+@@ -5,15 +5,6 @@
+ # Targets
+ AC_INIT(qdbm-ruby, 1.0.0)
+ 
+-# Building paths
+-pathtmp="$PATH"
+-PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
+-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
+-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
+-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
+-CPATH="$HOME/include:/usr/local/include:$CPATH"
+-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH
+-
+ # Setting the default prefix
+ if test "$prefix" = NONE
+ then

diff --git a/dev-db/qdbm/qdbm-1.8.78-r1.ebuild b/dev-db/qdbm/qdbm-1.8.78-r1.ebuild
index 6f6bd6fc00d..cbde7564d40 100644
--- a/dev-db/qdbm/qdbm-1.8.78-r1.ebuild
+++ b/dev-db/qdbm/qdbm-1.8.78-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit java-pkg-opt-2 perl-functions
+inherit autotools java-pkg-opt-2 perl-functions
 
 DESCRIPTION="Quick Database Manager"
 HOMEPAGE="http://fallabs.com/qdbm/"
@@ -24,12 +24,15 @@ DEPEND="${RDEPEND}
 	java? ( >=virtual/jdk-1.4:* )"
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-configure.patch
 	"${FILESDIR}"/${PN}-perl.patch
 	"${FILESDIR}"/${PN}-ruby19.patch
 	"${FILESDIR}"/${PN}-runpath.patch
 )
 HTML_DOCS=( doc/. )
 
+AT_NOELIBTOOLIZE="yes"
+
 qdbm_foreach_api() {
 	local u
 	for u in cxx java perl ruby; do
@@ -42,6 +45,10 @@ qdbm_foreach_api() {
 		fi
 		cd "${u}"
 		case "${EBUILD_PHASE}" in
+		prepare)
+			mv configure.{in,ac}
+			eautoreconf
+			;;
 		configure)
 			case "${u}" in
 			cgi|java|plus)
@@ -75,8 +82,13 @@ src_prepare() {
 		-e "/^CXXFLAGS/s|$| ${CXXFLAGS}|" \
 		-e "/^JAVACFLAGS/s|$| ${JAVACFLAGS}|" \
 		-e 's/make\( \|$\)/$(MAKE)\1/g' \
+		-e '/^debug/,/^$/s/LDFLAGS="[^"]*" //' \
 		Makefile.in {cgi,java,perl,plus,ruby}/Makefile.in
 	find -name "*~" -delete
+
+	mv configure.{in,ac}
+	eautoreconf
+	qdbm_foreach_api
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/qdbm/, dev-db/qdbm/files/
@ 2020-12-01 12:03 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2020-12-01 12:03 UTC (permalink / raw
  To: gentoo-commits

commit:     d787436065e7c11fd52451f2b33774b7a8366457
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  1 12:01:37 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec  1 12:03:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7874360

dev-db/qdbm: fix Darwin build

Package-Manager: Portage-3.0.10.2-prefix, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-db/qdbm/files/qdbm-1.8.78-darwin.patch | 28 ++++++++++++++++++++
 dev-db/qdbm/qdbm-1.8.78-r2.ebuild          | 42 ++++++++++++++++++++----------
 2 files changed, 56 insertions(+), 14 deletions(-)

diff --git a/dev-db/qdbm/files/qdbm-1.8.78-darwin.patch b/dev-db/qdbm/files/qdbm-1.8.78-darwin.patch
new file mode 100644
index 00000000000..de2d33c4ea1
--- /dev/null
+++ b/dev-db/qdbm/files/qdbm-1.8.78-darwin.patch
@@ -0,0 +1,28 @@
+diff --git a/Makefile.in b/Makefile.in
+index 2fec03a..2a1c3a3 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -52,18 +52,18 @@ DESTDIR =
+ # Building binaries
+ CC = @CC@
+ CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(MYHEADDIR) \
+-  -I$(HOME)/include -I/usr/local/include @MYDEFS@ \
++  -I$(HOME)/include @MYDEFS@ \
+   -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
+   -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \
+   -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG
+-CFLAGS = -Wall -pedantic -fPIC -fsigned-char -O3 -fomit-frame-pointer -fforce-addr @MYOPTS@
++CFLAGS = -Wall -pedantic -fPIC -fsigned-char -fforce-addr @MYOPTS@
+ LD = @LD@
+ LIBS = -lqdbm @LIBS@
+-LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib @LIBS@
+-LDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib $(LIBS)
++LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib @LIBS@
++LDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib $(LIBS)
+ AR = @AR@
+ ARFLAGS = rcsv
+-RUNENV = LD_LIBRARY_PATH=.:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
++RUNENV = LD_LIBRARY_PATH=./:$(MYLIBDIR):$(HOME)/lib
+ 
+ 
+ 

diff --git a/dev-db/qdbm/qdbm-1.8.78-r2.ebuild b/dev-db/qdbm/qdbm-1.8.78-r2.ebuild
index 40f5281fa88..1906d48f020 100644
--- a/dev-db/qdbm/qdbm-1.8.78-r2.ebuild
+++ b/dev-db/qdbm/qdbm-1.8.78-r2.ebuild
@@ -32,6 +32,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-perl.patch
 	"${FILESDIR}"/${PN}-ruby19.patch
 	"${FILESDIR}"/${PN}-runpath.patch
+	"${FILESDIR}"/${PN}-1.8.78-darwin.patch
 )
 HTML_DOCS=( doc/. )
 
@@ -99,10 +100,10 @@ src_prepare() {
 		-e "/^JAVACFLAGS/s|$| ${JAVACFLAGS}|" \
 		-e 's/make\( \|$\)/$(MAKE)\1/g' \
 		-e '/^debug/,/^$/s/LDFLAGS="[^"]*" //' \
-		Makefile.in {cgi,java,perl,plus,ruby}/Makefile.in
-	find -name "*~" -delete
+		Makefile.in {cgi,java,perl,plus,ruby}/Makefile.in || die
+	find -name "*~" -delete || die
 
-	mv configure.{in,ac}
+	mv configure.{in,ac} || die
 	eautoreconf
 	qdbm_foreach_api
 }
@@ -111,9 +112,9 @@ each_ruby_prepare() {
 	sed -i \
 		-e "s|ruby |${RUBY} |" \
 		-e "s|\.\./\.\.|${WORKDIR}/all/${P}|" \
-		{Makefile,configure}.in {curia,depot,villa}/extconf.rb
+		{Makefile,configure}.in {curia,depot,villa}/extconf.rb || die
 
-	mv configure.{in,ac}
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
@@ -133,8 +134,12 @@ each_ruby_configure() {
 }
 
 src_compile() {
-	default
-	qdbm_foreach_api
+	if [[ ${CHOST} == *darwin* ]] ; then
+		emake mac
+	else
+		default
+		qdbm_foreach_api
+	fi
 }
 
 each_ruby_compile() {
@@ -142,8 +147,12 @@ each_ruby_compile() {
 }
 
 src_test() {
-	default
-	qdbm_foreach_api
+	if [[ ${CHOST} == *darwin* ]] ; then
+		emake check-mac
+	else
+		default
+		qdbm_foreach_api
+	fi
 }
 
 each_ruby_test() {
@@ -151,23 +160,28 @@ each_ruby_test() {
 }
 
 src_install() {
-	default
+	if [[ ${CHOST} == *darwin* ]] ; then
+		emake install-mac
+	else
+		default
+	fi
+
 	qdbm_foreach_api
 	use static-libs || find "${ED}" -name '*.a' -delete || die
 
-	rm -rf "${ED}"/usr/share/${PN}
+	rm -rf "${ED}"/usr/share/${PN} || die
 
 	if use java; then
 		java-pkg_dojar "${ED}"/usr/$(get_libdir)/*.jar
-		rm -f "${ED}"/usr/$(get_libdir)/*.jar
+		rm -f "${ED}"/usr/$(get_libdir)/*.jar || die
 	fi
 	if use perl; then
 		perl_delete_module_manpages
 		perl_fix_packlist
 	fi
 
-	rm -f "${ED}"/usr/bin/*test
-	rm -f "${ED}"/usr/share/man/man1/*test.1*
+	rm -f "${ED}"/usr/bin/*test || die
+	rm -f "${ED}"/usr/share/man/man1/*test.1* || die
 }
 
 each_ruby_install() {


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/qdbm/, dev-db/qdbm/files/
@ 2024-05-07 12:51 Akinori Hattori
  0 siblings, 0 replies; 3+ messages in thread
From: Akinori Hattori @ 2024-05-07 12:51 UTC (permalink / raw
  To: gentoo-commits

commit:     0cab7bd32a6042bf81e193e5ccaccb7bcbb84aed
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue May  7 12:50:11 2024 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue May  7 12:50:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cab7bd3

dev-db/qdbm: fix build with USE=ruby

Closes: https://bugs.gentoo.org/926167
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 dev-db/qdbm/files/qdbm-ruby.patch                  | 81 ++++++++++++++++++++++
 ...qdbm-1.8.78-r4.ebuild => qdbm-1.8.78-r5.ebuild} |  3 +-
 2 files changed, 83 insertions(+), 1 deletion(-)

diff --git a/dev-db/qdbm/files/qdbm-ruby.patch b/dev-db/qdbm/files/qdbm-ruby.patch
new file mode 100644
index 000000000000..8b1a946d8d8c
--- /dev/null
+++ b/dev-db/qdbm/files/qdbm-ruby.patch
@@ -0,0 +1,81 @@
+--- a/ruby/curia/extconf.rb
++++ b/ruby/curia/extconf.rb
+@@ -2,10 +2,9 @@
+ 
+ dir_config("curia")
+ 
+-home = ENV['HOME']
+-$CFLAGS = "-I. -I../.. -I#{home}/include -I/usr/local/include"
+-$LDFLAGS = "-L../.. -L#{home}/lib -L/usr/local/lib"
+-$LIBS = "-L../.. -L#{home}/lib -L/usr/local/lib"
++$CFLAGS  << " -I../.. " << ENV["CFLAGS"]
++$LDFLAGS << " -L../.. " << ENV["LDFLAGS"]
++$LIBS    << " -L../.."
+ 
+ have_library("c", "main")
+ have_library("pthread", "main")
+--- a/ruby/curia/mod_curia.c
++++ b/ruby/curia/mod_curia.c
+@@ -84,7 +84,7 @@
+  *************************************************************************************************/
+ 
+ 
+-Init_mod_curia(){
++void Init_mod_curia(void){
+   crinit();
+   ccuriaerror = rb_define_class("CuriaError", rb_eStandardError);
+   ccuriaerror_ENOERR = rb_define_class("CuriaError_ENOERR", ccuriaerror);
+--- a/ruby/depot/extconf.rb
++++ b/ruby/depot/extconf.rb
+@@ -2,10 +2,9 @@
+ 
+ dir_config("depot")
+ 
+-home = ENV['HOME']
+-$CFLAGS = "-I. -I../.. -I#{home}/include -I/usr/local/include"
+-$LDFLAGS = "-L../.. -L#{home}/lib -L/usr/local/lib"
+-$LIBS = "-L../.. -L#{home}/lib -L/usr/local/lib"
++$CFLAGS  << " -I../.. " << ENV["CFLAGS"]
++$LDFLAGS << " -L../.. " << ENV["LDFLAGS"]
++$LIBS    << " -L../.."
+ 
+ have_library("c", "main")
+ have_library("pthread", "main")
+--- a/ruby/depot/mod_depot.c
++++ b/ruby/depot/mod_depot.c
+@@ -83,7 +83,7 @@
+  *************************************************************************************************/
+ 
+ 
+-Init_mod_depot(){
++void Init_mod_depot(void){
+   dpinit();
+   cdepoterror = rb_define_class("DepotError", rb_eStandardError);
+   cdepoterror_ENOERR = rb_define_class("DepotError_ENOERR", cdepoterror);
+--- a/ruby/villa/extconf.rb
++++ b/ruby/villa/extconf.rb
+@@ -2,10 +2,9 @@
+ 
+ dir_config("villa")
+ 
+-home = ENV['HOME']
+-$CFLAGS = "-I. -I../.. -I#{home}/include -I/usr/local/include"
+-$LDFLAGS = "-L../.. -L#{home}/lib -L/usr/local/lib"
+-$LIBS = "-L../.. -L#{home}/lib -L/usr/local/lib"
++$CFLAGS  << " -I../.. " << ENV["CFLAGS"]
++$LDFLAGS << " -L../.. " << ENV["LDFLAGS"]
++$LIBS    << " -L../.."
+ 
+ have_library("c", "main")
+ have_library("pthread", "main")
+--- a/ruby/villa/mod_villa.c
++++ b/ruby/villa/mod_villa.c
+@@ -97,7 +97,7 @@
+  *************************************************************************************************/
+ 
+ 
+-Init_mod_villa(){
++void Init_mod_villa(void){
+   vlinit();
+   cvillaerror = rb_define_class("VillaError", rb_eStandardError);
+   cvillaerror_ENOERR = rb_define_class("VillaError_ENOERR", cvillaerror);

diff --git a/dev-db/qdbm/qdbm-1.8.78-r4.ebuild b/dev-db/qdbm/qdbm-1.8.78-r5.ebuild
similarity index 98%
rename from dev-db/qdbm/qdbm-1.8.78-r4.ebuild
rename to dev-db/qdbm/qdbm-1.8.78-r5.ebuild
index f1ea111f2075..d2b808795c42 100644
--- a/dev-db/qdbm/qdbm-1.8.78-r4.ebuild
+++ b/dev-db/qdbm/qdbm-1.8.78-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -30,6 +30,7 @@ RUBY_S="${P}/ruby"
 PATCHES=(
 	"${FILESDIR}"/${PN}-configure.patch
 	"${FILESDIR}"/${PN}-perl.patch
+	"${FILESDIR}"/${PN}-ruby.patch
 	"${FILESDIR}"/${PN}-ruby19.patch
 	"${FILESDIR}"/${PN}-runpath.patch
 	"${FILESDIR}"/${PN}-darwin.patch


^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-05-07 12:51 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-07 12:51 [gentoo-commits] repo/gentoo:master commit in: dev-db/qdbm/, dev-db/qdbm/files/ Akinori Hattori
  -- strict thread matches above, loose matches on Subject: below --
2020-12-01 12:03 Sam James
2017-03-30 14:32 Akinori Hattori

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox