| 1 |
commit: d787436065e7c11fd52451f2b33774b7a8366457 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 1 12:01:37 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 1 12:03:07 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7874360 |
| 7 |
|
| 8 |
dev-db/qdbm: fix Darwin build |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.10.2-prefix, Repoman-3.0.2 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-db/qdbm/files/qdbm-1.8.78-darwin.patch | 28 ++++++++++++++++++++ |
| 14 |
dev-db/qdbm/qdbm-1.8.78-r2.ebuild | 42 ++++++++++++++++++++---------- |
| 15 |
2 files changed, 56 insertions(+), 14 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-db/qdbm/files/qdbm-1.8.78-darwin.patch b/dev-db/qdbm/files/qdbm-1.8.78-darwin.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..de2d33c4ea1 |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-db/qdbm/files/qdbm-1.8.78-darwin.patch |
| 22 |
@@ -0,0 +1,28 @@ |
| 23 |
+diff --git a/Makefile.in b/Makefile.in |
| 24 |
+index 2fec03a..2a1c3a3 100644 |
| 25 |
+--- a/Makefile.in |
| 26 |
++++ b/Makefile.in |
| 27 |
+@@ -52,18 +52,18 @@ DESTDIR = |
| 28 |
+ # Building binaries |
| 29 |
+ CC = @CC@ |
| 30 |
+ CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(MYHEADDIR) \ |
| 31 |
+- -I$(HOME)/include -I/usr/local/include @MYDEFS@ \ |
| 32 |
++ -I$(HOME)/include @MYDEFS@ \ |
| 33 |
+ -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \ |
| 34 |
+ -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \ |
| 35 |
+ -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG |
| 36 |
+-CFLAGS = -Wall -pedantic -fPIC -fsigned-char -O3 -fomit-frame-pointer -fforce-addr @MYOPTS@ |
| 37 |
++CFLAGS = -Wall -pedantic -fPIC -fsigned-char -fforce-addr @MYOPTS@ |
| 38 |
+ LD = @LD@ |
| 39 |
+ LIBS = -lqdbm @LIBS@ |
| 40 |
+-LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib @LIBS@ |
| 41 |
+-LDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib $(LIBS) |
| 42 |
++LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib @LIBS@ |
| 43 |
++LDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib $(LIBS) |
| 44 |
+ AR = @AR@ |
| 45 |
+ ARFLAGS = rcsv |
| 46 |
+-RUNENV = LD_LIBRARY_PATH=.:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib |
| 47 |
++RUNENV = LD_LIBRARY_PATH=./:$(MYLIBDIR):$(HOME)/lib |
| 48 |
+ |
| 49 |
+ |
| 50 |
+ |
| 51 |
|
| 52 |
diff --git a/dev-db/qdbm/qdbm-1.8.78-r2.ebuild b/dev-db/qdbm/qdbm-1.8.78-r2.ebuild |
| 53 |
index 40f5281fa88..1906d48f020 100644 |
| 54 |
--- a/dev-db/qdbm/qdbm-1.8.78-r2.ebuild |
| 55 |
+++ b/dev-db/qdbm/qdbm-1.8.78-r2.ebuild |
| 56 |
@@ -32,6 +32,7 @@ PATCHES=( |
| 57 |
"${FILESDIR}"/${PN}-perl.patch |
| 58 |
"${FILESDIR}"/${PN}-ruby19.patch |
| 59 |
"${FILESDIR}"/${PN}-runpath.patch |
| 60 |
+ "${FILESDIR}"/${PN}-1.8.78-darwin.patch |
| 61 |
) |
| 62 |
HTML_DOCS=( doc/. ) |
| 63 |
|
| 64 |
@@ -99,10 +100,10 @@ src_prepare() { |
| 65 |
-e "/^JAVACFLAGS/s|$| ${JAVACFLAGS}|" \ |
| 66 |
-e 's/make\( \|$\)/$(MAKE)\1/g' \ |
| 67 |
-e '/^debug/,/^$/s/LDFLAGS="[^"]*" //' \ |
| 68 |
- Makefile.in {cgi,java,perl,plus,ruby}/Makefile.in |
| 69 |
- find -name "*~" -delete |
| 70 |
+ Makefile.in {cgi,java,perl,plus,ruby}/Makefile.in || die |
| 71 |
+ find -name "*~" -delete || die |
| 72 |
|
| 73 |
- mv configure.{in,ac} |
| 74 |
+ mv configure.{in,ac} || die |
| 75 |
eautoreconf |
| 76 |
qdbm_foreach_api |
| 77 |
} |
| 78 |
@@ -111,9 +112,9 @@ each_ruby_prepare() { |
| 79 |
sed -i \ |
| 80 |
-e "s|ruby |${RUBY} |" \ |
| 81 |
-e "s|\.\./\.\.|${WORKDIR}/all/${P}|" \ |
| 82 |
- {Makefile,configure}.in {curia,depot,villa}/extconf.rb |
| 83 |
+ {Makefile,configure}.in {curia,depot,villa}/extconf.rb || die |
| 84 |
|
| 85 |
- mv configure.{in,ac} |
| 86 |
+ mv configure.{in,ac} || die |
| 87 |
eautoreconf |
| 88 |
} |
| 89 |
|
| 90 |
@@ -133,8 +134,12 @@ each_ruby_configure() { |
| 91 |
} |
| 92 |
|
| 93 |
src_compile() { |
| 94 |
- default |
| 95 |
- qdbm_foreach_api |
| 96 |
+ if [[ ${CHOST} == *darwin* ]] ; then |
| 97 |
+ emake mac |
| 98 |
+ else |
| 99 |
+ default |
| 100 |
+ qdbm_foreach_api |
| 101 |
+ fi |
| 102 |
} |
| 103 |
|
| 104 |
each_ruby_compile() { |
| 105 |
@@ -142,8 +147,12 @@ each_ruby_compile() { |
| 106 |
} |
| 107 |
|
| 108 |
src_test() { |
| 109 |
- default |
| 110 |
- qdbm_foreach_api |
| 111 |
+ if [[ ${CHOST} == *darwin* ]] ; then |
| 112 |
+ emake check-mac |
| 113 |
+ else |
| 114 |
+ default |
| 115 |
+ qdbm_foreach_api |
| 116 |
+ fi |
| 117 |
} |
| 118 |
|
| 119 |
each_ruby_test() { |
| 120 |
@@ -151,23 +160,28 @@ each_ruby_test() { |
| 121 |
} |
| 122 |
|
| 123 |
src_install() { |
| 124 |
- default |
| 125 |
+ if [[ ${CHOST} == *darwin* ]] ; then |
| 126 |
+ emake install-mac |
| 127 |
+ else |
| 128 |
+ default |
| 129 |
+ fi |
| 130 |
+ |
| 131 |
qdbm_foreach_api |
| 132 |
use static-libs || find "${ED}" -name '*.a' -delete || die |
| 133 |
|
| 134 |
- rm -rf "${ED}"/usr/share/${PN} |
| 135 |
+ rm -rf "${ED}"/usr/share/${PN} || die |
| 136 |
|
| 137 |
if use java; then |
| 138 |
java-pkg_dojar "${ED}"/usr/$(get_libdir)/*.jar |
| 139 |
- rm -f "${ED}"/usr/$(get_libdir)/*.jar |
| 140 |
+ rm -f "${ED}"/usr/$(get_libdir)/*.jar || die |
| 141 |
fi |
| 142 |
if use perl; then |
| 143 |
perl_delete_module_manpages |
| 144 |
perl_fix_packlist |
| 145 |
fi |
| 146 |
|
| 147 |
- rm -f "${ED}"/usr/bin/*test |
| 148 |
- rm -f "${ED}"/usr/share/man/man1/*test.1* |
| 149 |
+ rm -f "${ED}"/usr/bin/*test || die |
| 150 |
+ rm -f "${ED}"/usr/share/man/man1/*test.1* || die |
| 151 |
} |
| 152 |
|
| 153 |
each_ruby_install() { |
Archives