summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2021-03-13 13:04:34 +0100
committerDavid Seifert <soap@gentoo.org>2021-03-13 13:04:34 +0100
commite0bd56e659f6b391b92579bdf99350455542b4a8 (patch)
treedb1aadb0c511e07c132ef1ca78d83bcad00011ec
parentsci-biology/embassy-esim4: Port to EAPI 7 (diff)
downloadgentoo-e0bd56e659f6b391b92579bdf99350455542b4a8.tar.gz
gentoo-e0bd56e659f6b391b92579bdf99350455542b4a8.tar.bz2
gentoo-e0bd56e659f6b391b92579bdf99350455542b4a8.zip
sci-biology/embassy-clustalomega: Fix building against clang/LLD
Closes: https://bugs.gentoo.org/731754 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: David Seifert <soap@gentoo.org>
-rw-r--r--sci-biology/embassy-clustalomega/files/embassy-clustalomega-1.1.0_fix-build-system.patch31
1 files changed, 17 insertions, 14 deletions
diff --git a/sci-biology/embassy-clustalomega/files/embassy-clustalomega-1.1.0_fix-build-system.patch b/sci-biology/embassy-clustalomega/files/embassy-clustalomega-1.1.0_fix-build-system.patch
index 5525d79b525..7f92130fb50 100644
--- a/sci-biology/embassy-clustalomega/files/embassy-clustalomega-1.1.0_fix-build-system.patch
+++ b/sci-biology/embassy-clustalomega/files/embassy-clustalomega-1.1.0_fix-build-system.patch
@@ -1,12 +1,6 @@
- configure.ac | 49 +++++++------------------------------------------
- src/Makefile.am | 6 ++----
- 2 files changed, 9 insertions(+), 46 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f12ed19..b143922 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
+@@ -635,33 +635,6 @@
@@ -40,7 +34,7 @@ index f12ed19..b143922 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"],
-@@ -737,21 +710,6 @@ AX_LIB_POSTGRESQL
+@@ -737,21 +710,6 @@
@@ -62,7 +56,7 @@ index f12ed19..b143922 100644
dnl Test if --enable-localforce given
locallink="no"
embprefix="/usr/local"
-@@ -874,6 +832,13 @@ AC_ARG_ENABLE([systemlibs],
+@@ -874,6 +832,13 @@
AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"])
@@ -76,11 +70,9 @@ index f12ed19..b143922 100644
# Enable the purify tool: --enable-purify, sets CC and LIBTOOL
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 9135679..c201149 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -17,9 +17,7 @@ AM_CPPFLAGS = -I../../../nucleus -I../../../ajax/pcre \
+@@ -17,9 +17,7 @@
-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
-I../../../ajax/acd -I../../../plplot
else
@@ -91,10 +83,21 @@ index 9135679..c201149 100644
endif
if ISSHARED
-@@ -62,5 +60,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \
+@@ -34,7 +32,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
+@@ -61,6 +59,6 @@
+ ../../../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