summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2020-11-01 19:36:08 +0100
committerDavid Seifert <soap@gentoo.org>2020-11-01 19:36:08 +0100
commitead8097cca9fbc1dffd7c78127325306dfba0104 (patch)
tree8edea8d0aaeb03aa682eb7dfc219da72e76035c2 /sci-biology/embassy-phylipnew
parentsci-biology/embassy-phylipnew: Fix -fno-common (diff)
downloadgentoo-ead8097cca9fbc1dffd7c78127325306dfba0104.tar.gz
gentoo-ead8097cca9fbc1dffd7c78127325306dfba0104.tar.bz2
gentoo-ead8097cca9fbc1dffd7c78127325306dfba0104.zip
sci-biology/embassy-phylipnew: Patch out -L/usr/lib for LLD
Closes: https://bugs.gentoo.org/731858 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'sci-biology/embassy-phylipnew')
-rw-r--r--sci-biology/embassy-phylipnew/files/embassy-phylipnew-3.69.650_fix-build-system.patch34
1 files changed, 17 insertions, 17 deletions
diff --git a/sci-biology/embassy-phylipnew/files/embassy-phylipnew-3.69.650_fix-build-system.patch b/sci-biology/embassy-phylipnew/files/embassy-phylipnew-3.69.650_fix-build-system.patch
index 1cba944094a..95951e63218 100644
--- a/sci-biology/embassy-phylipnew/files/embassy-phylipnew-3.69.650_fix-build-system.patch
+++ b/sci-biology/embassy-phylipnew/files/embassy-phylipnew-3.69.650_fix-build-system.patch
@@ -1,13 +1,6 @@
- configure.ac | 49 +++++++------------------------------------------
- emboss_acd/Makefile.am | 2 +-
- src/Makefile.am | 7 ++-----
- 3 files changed, 10 insertions(+), 48 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e5bfaf1..09ed517 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
+@@ -635,33 +635,6 @@
@@ -41,7 +34,7 @@ index e5bfaf1..09ed517 100644
dnl FIXME: This does no longer seem required with Autoconf 2.67?
dnl Intel MacOSX 10.6 puts X11 in a non-standard place
dnl AS_IF([test "x${with_x}" != "xno"],
-@@ -781,21 +754,6 @@ AX_LIB_POSTGRESQL
+@@ -781,21 +754,6 @@
@@ -63,7 +56,7 @@ index e5bfaf1..09ed517 100644
dnl Test if --enable-localforce given
locallink="no"
embprefix="/usr/local"
-@@ -918,6 +876,13 @@ AC_ARG_ENABLE([systemlibs],
+@@ -918,6 +876,13 @@
AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"])
@@ -77,8 +70,6 @@ index e5bfaf1..09ed517 100644
# Enable the purify tool: --enable-purify, sets CC and LIBTOOL
-diff --git a/emboss_acd/Makefile.am b/emboss_acd/Makefile.am
-index e1c1878..e253c95 100644
--- a/emboss_acd/Makefile.am
+++ b/emboss_acd/Makefile.am
@@ -1,3 +1,3 @@
@@ -86,11 +77,9 @@ index e1c1878..e253c95 100644
-pkgdata_DATA = *.acd
+pkgdata_DATA = $(srcdir)/*.acd
pkgdatadir=$(prefix)/share/EMBOSS/acd
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 1883ce9..fb1787f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -16,10 +16,7 @@ AM_CPPFLAGS = -I../include -I../../../nucleus -I../../../ajax/pcre \
+@@ -16,10 +16,7 @@
-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
-I../../../ajax/acd -I../../../plplot
else
@@ -102,10 +91,21 @@ index 1883ce9..fb1787f 100644
endif
if ISSHARED
-@@ -120,5 +117,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \
+@@ -34,7 +31,7 @@
+ -lnucleus -lacd -lajaxdb -lensembl -lajaxg -lajax -lepcre \
+ $(NLAIXLIBS) -leplplot
+ else
+-AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -L${embprefix}/lib -lnucleus -lacd \
++AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -lnucleus -lacd \
+ -lajaxdb -lensembl -lajaxg -lajax -lepcre $(NLAIXLIBS) -leplplot
+ endif
+ endif
+@@ -119,6 +116,6 @@
+ ../../../ajax/pcre/libepcre.la \
../../../plplot/libeplplot.la $(XLIB)
else
- LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
+-LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
- -lajax -lepcre $(NLADD) -leplplot $(XLIB)
++LDADD = -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
+ -lajax $(NLADD) $(XLIB)
endif