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

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

[David Seifert]

commit:     6e8ffa30b0e494f08d1c6e923e16ca66c9327276
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  2 22:10:59 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Nov  2 22:10:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e8ffa30

sci-biology/embassy-emnu: Patch out -L/usr/lib for LLD

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

 .../embassy-emnu-1.05.650_fix-build-system.patch   | 45 +++++++++++-----------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/sci-biology/embassy-emnu/files/embassy-emnu-1.05.650_fix-build-system.patch b/sci-biology/embassy-emnu/files/embassy-emnu-1.05.650_fix-build-system.patch
index 4e14bac1704..ecd7f928da3 100644
--- a/sci-biology/embassy-emnu/files/embassy-emnu-1.05.650_fix-build-system.patch
+++ b/sci-biology/embassy-emnu/files/embassy-emnu-1.05.650_fix-build-system.patch
@@ -1,13 +1,6 @@
- configure.ac           | 67 +++++++++++---------------------------------------
- emboss_acd/Makefile.am |  2 +-
- src/Makefile.am        |  7 +++---
- 3 files changed, 18 insertions(+), 58 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7482ade..b815bdb 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
+@@ -635,33 +635,6 @@
  
  
  
@@ -41,7 +34,7 @@ index 7482ade..b815bdb 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 7482ade..b815bdb 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,23 +70,24 @@ index 7482ade..b815bdb 100644
  
  
  # Enable the purify tool: --enable-purify, sets CC and LIBTOOL
-@@ -899,20 +864,16 @@ dnl fi
+@@ -899,20 +864,16 @@
  
  
  dnl emnu and mse only: uses curses
 -dnl Test if --with-curses is given
 -AC_ARG_WITH([curses],
 -[AS_HELP_STRING([--with-curses], [curses (or ncurses)])])
-+dnl Test if --enable-curses is given
-+AC_ARG_ENABLE([curses],
-+[AS_HELP_STRING([--enable-curses], [curses])])
- 
+-
 -AC_MSG_CHECKING([for curses])
 -
 -AS_IF([test "${with_curses}"],
 -[
 -  CPPFLAGS="$CPPFLAGS -I${with_curses}/include -I${with_curses}/include/ncurses"
 -  LDFLAGS="$LDFLAGS -L${with_curses}/lib"
++dnl Test if --enable-curses is given
++AC_ARG_ENABLE([curses],
++[AS_HELP_STRING([--enable-curses], [curses])])
++
 +AS_IF([test "x$enable_curses" = "xyes"], [
 +  PKG_CHECK_MODULES([NCURSES], [ncurses])
 +  PKG_CHECK_MODULES([FORM], [form])
@@ -105,8 +99,6 @@ index 7482ade..b815bdb 100644
  
  
  
-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 @@
@@ -114,11 +106,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 b295079..330c76f 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -17,9 +17,8 @@ AM_CPPFLAGS = -I../../../nucleus -I../../../ajax/pcre \
+@@ -17,9 +17,8 @@
  	-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
  	-I../../../ajax/acd -I../../../plplot
  else
@@ -130,10 +120,21 @@ index b295079..330c76f 100644
  endif
  
  if ISSHARED
-@@ -57,5 +56,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \
+@@ -34,7 +33,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
+@@ -56,6 +55,6 @@
+ 	../../../ajax/pcre/libepcre.la \
  	../../../plplot/libeplplot.la -lmenu -lform $(XLIB)
  else
- LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
+-LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
 -        -lajax -lepcre $(NLADD) -leplplot -lmenu -lform $(XLIB)
++LDADD = -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
 +        -lajax $(NLADD) $(NCURSES_LIBS) $(FORM_LIBS) $(MENU_LIBS) $(XLIB)
  endif