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

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

[David Seifert]

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

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

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

 ...bassy-cbstools-1.0.0.650_fix-build-system.patch | 34 +++++++++++-----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/sci-biology/embassy-cbstools/files/embassy-cbstools-1.0.0.650_fix-build-system.patch b/sci-biology/embassy-cbstools/files/embassy-cbstools-1.0.0.650_fix-build-system.patch
index d29310efcb4..bdaaaf98f23 100644
--- a/sci-biology/embassy-cbstools/files/embassy-cbstools-1.0.0.650_fix-build-system.patch
+++ b/sci-biology/embassy-cbstools/files/embassy-cbstools-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 a70d4d2..b8f5e79 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
+@@ -635,33 +635,6 @@
  
  
  
@@ -41,7 +34,7 @@ index a70d4d2..b8f5e79 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 a70d4d2..b8f5e79 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 a70d4d2..b8f5e79 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 824a03c..9db171d 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -19,9 +19,7 @@ AM_CPPFLAGS = -I../../../nucleus -I../../../ajax/pcre \
+@@ -19,9 +19,7 @@
  	-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
  	-I../../../ajax/acd -I../../../plplot
  else
@@ -101,10 +90,21 @@ index 824a03c..9db171d 100644
  endif
  
  if ISSHARED
-@@ -65,5 +63,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \
+@@ -36,7 +34,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
+@@ -64,6 +62,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