summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2021-03-13 13:04:28 +0100
committerDavid Seifert <soap@gentoo.org>2021-03-13 13:04:28 +0100
commite8dd0ed686d27359382aa2f85c7777d5b63608bb (patch)
tree5bc142ab9ccbf5f4468b6608643b32cf43a0b509
parentsci-biology/embassy-domsearch: Port to EAPI 7 (diff)
downloadgentoo-e8dd0ed686d27359382aa2f85c7777d5b63608bb.tar.gz
gentoo-e8dd0ed686d27359382aa2f85c7777d5b63608bb.tar.bz2
gentoo-e8dd0ed686d27359382aa2f85c7777d5b63608bb.zip
sci-biology/embassy-esim4: Fix building against clang/LLD
Closes: https://bugs.gentoo.org/731742 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: David Seifert <soap@gentoo.org>
-rw-r--r--sci-biology/embassy-esim4/files/embassy-esim4-1.0.0.650_fix-build-system.patch34
1 files changed, 17 insertions, 17 deletions
diff --git a/sci-biology/embassy-esim4/files/embassy-esim4-1.0.0.650_fix-build-system.patch b/sci-biology/embassy-esim4/files/embassy-esim4-1.0.0.650_fix-build-system.patch
index ead54c91b5f..7a85b4f7bf8 100644
--- a/sci-biology/embassy-esim4/files/embassy-esim4-1.0.0.650_fix-build-system.patch
+++ b/sci-biology/embassy-esim4/files/embassy-esim4-1.0.0.650_fix-build-system.patch
@@ -1,13 +1,6 @@
- configure.ac | 49 +++++++------------------------------------------
- emboss_acd/Makefile.am | 2 +-
- src/Makefile.am | 6 ++----
- 3 files changed, 10 insertions(+), 47 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 924220a..2c45f46 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
+@@ -635,33 +635,6 @@
@@ -41,7 +34,7 @@ index 924220a..2c45f46 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 @@
@@ -63,7 +56,7 @@ index 924220a..2c45f46 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"])
@@ -77,8 +70,6 @@ index 924220a..2c45f46 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 0620938..0304bb8 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
@@ -101,10 +90,21 @@ index 0620938..0304bb8 100644
endif
if ISSHARED
-@@ -63,5 +61,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
+@@ -62,6 +60,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