diff options
Diffstat (limited to 'sci-biology')
| -rw-r--r-- | sci-biology/embassy-domsearch/files/embassy-domsearch-0.1.650_fix-build-system.patch | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/sci-biology/embassy-domsearch/files/embassy-domsearch-0.1.650_fix-build-system.patch b/sci-biology/embassy-domsearch/files/embassy-domsearch-0.1.650_fix-build-system.patch index d24857c8386d..ecc702edcb66 100644 --- a/sci-biology/embassy-domsearch/files/embassy-domsearch-0.1.650_fix-build-system.patch +++ b/sci-biology/embassy-domsearch/files/embassy-domsearch-0.1.650_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 f0f97fa..d419d7d 100644 --- a/configure.ac +++ b/configure.ac -@@ -635,33 +635,6 @@ AS_CASE([${host_os}], +@@ -635,33 +635,6 @@ @@ -40,7 +34,7 @@ index f0f97fa..d419d7d 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 f0f97fa..d419d7d 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 f0f97fa..d419d7d 100644 # Enable the purify tool: --enable-purify, sets CC and LIBTOOL -diff --git a/src/Makefile.am b/src/Makefile.am -index 9829ebd..433a5c5 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 9829ebd..433a5c5 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 @@ + ../../../ajax/pcre/libepcre.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 |