[gentoo-commits] repo/gentoo:master commit in: sci-biology/embassy-domalign/files/

[gentoo-commits] repo/gentoo:master commit in: sci-biology/embassy-domalign/files/

[David Seifert]

commit:     4ecb78afc43f90b7876f3f0c6974b45ca61b9d6d
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 13 12:04:40 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Mar 13 12:04:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ecb78af

sci-biology/embassy-domalign: Fix building against clang/LLD

Closes: https://bugs.gentoo.org/731756
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 ...embassy-domalign-0.1.650_fix-build-system.patch | 31 ++++++++++++----------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/sci-biology/embassy-domalign/files/embassy-domalign-0.1.650_fix-build-system.patch b/sci-biology/embassy-domalign/files/embassy-domalign-0.1.650_fix-build-system.patch
index 033ddf7b653..079850c2bcc 100644
--- a/sci-biology/embassy-domalign/files/embassy-domalign-0.1.650_fix-build-system.patch
+++ b/sci-biology/embassy-domalign/files/embassy-domalign-0.1.650_fix-build-system.patch
@@ -1,12 +1,6 @@
- configure.ac    | 49 +++++++------------------------------------------
- src/Makefile.am |  7 ++-----
- 2 files changed, 9 insertions(+), 47 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 693eb4d..dc0fda9 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
+@@ -635,33 +635,6 @@
  
  
  
@@ -40,7 +34,7 @@ index 693eb4d..dc0fda9 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 693eb4d..dc0fda9 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 693eb4d..dc0fda9 100644
  
  
  # Enable the purify tool: --enable-purify, sets CC and LIBTOOL
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 8785446..fe85f11 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -17,10 +17,7 @@ AM_CPPFLAGS = -I../include -I../../../nucleus -I../../../ajax/pcre \
+@@ -17,10 +17,7 @@
  	-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
  	-I../../../ajax/acd -I../../../plplot
  else
@@ -92,10 +84,21 @@ index 8785446..fe85f11 100644
  endif
  
  if ISSHARED
-@@ -63,5 +60,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \
+@@ -35,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 +59,6 @@
+ 	../../../ajax/zlib/libezlib.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