1 |
commit: ead8097cca9fbc1dffd7c78127325306dfba0104 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 1 18:36:08 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 1 18:36:08 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ead8097c |
7 |
|
8 |
sci-biology/embassy-phylipnew: Patch out -L/usr/lib for LLD |
9 |
|
10 |
Closes: https://bugs.gentoo.org/731858 |
11 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
13 |
|
14 |
...bassy-phylipnew-3.69.650_fix-build-system.patch | 34 +++++++++++----------- |
15 |
1 file changed, 17 insertions(+), 17 deletions(-) |
16 |
|
17 |
diff --git a/sci-biology/embassy-phylipnew/files/embassy-phylipnew-3.69.650_fix-build-system.patch b/sci-biology/embassy-phylipnew/files/embassy-phylipnew-3.69.650_fix-build-system.patch |
18 |
index 1cba944094a..95951e63218 100644 |
19 |
--- a/sci-biology/embassy-phylipnew/files/embassy-phylipnew-3.69.650_fix-build-system.patch |
20 |
+++ b/sci-biology/embassy-phylipnew/files/embassy-phylipnew-3.69.650_fix-build-system.patch |
21 |
@@ -1,13 +1,6 @@ |
22 |
- configure.ac | 49 +++++++------------------------------------------ |
23 |
- emboss_acd/Makefile.am | 2 +- |
24 |
- src/Makefile.am | 7 ++----- |
25 |
- 3 files changed, 10 insertions(+), 48 deletions(-) |
26 |
- |
27 |
-diff --git a/configure.ac b/configure.ac |
28 |
-index e5bfaf1..09ed517 100644 |
29 |
--- a/configure.ac |
30 |
+++ b/configure.ac |
31 |
-@@ -635,33 +635,6 @@ AS_CASE([${host_os}], |
32 |
+@@ -635,33 +635,6 @@ |
33 |
|
34 |
|
35 |
|
36 |
@@ -41,7 +34,7 @@ index e5bfaf1..09ed517 100644 |
37 |
dnl FIXME: This does no longer seem required with Autoconf 2.67? |
38 |
dnl Intel MacOSX 10.6 puts X11 in a non-standard place |
39 |
dnl AS_IF([test "x${with_x}" != "xno"], |
40 |
-@@ -781,21 +754,6 @@ AX_LIB_POSTGRESQL |
41 |
+@@ -781,21 +754,6 @@ |
42 |
|
43 |
|
44 |
|
45 |
@@ -63,7 +56,7 @@ index e5bfaf1..09ed517 100644 |
46 |
dnl Test if --enable-localforce given |
47 |
locallink="no" |
48 |
embprefix="/usr/local" |
49 |
-@@ -918,6 +876,13 @@ AC_ARG_ENABLE([systemlibs], |
50 |
+@@ -918,6 +876,13 @@ |
51 |
AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"]) |
52 |
|
53 |
|
54 |
@@ -77,8 +70,6 @@ index e5bfaf1..09ed517 100644 |
55 |
|
56 |
|
57 |
# Enable the purify tool: --enable-purify, sets CC and LIBTOOL |
58 |
-diff --git a/emboss_acd/Makefile.am b/emboss_acd/Makefile.am |
59 |
-index e1c1878..e253c95 100644 |
60 |
--- a/emboss_acd/Makefile.am |
61 |
+++ b/emboss_acd/Makefile.am |
62 |
@@ -1,3 +1,3 @@ |
63 |
@@ -86,11 +77,9 @@ index e1c1878..e253c95 100644 |
64 |
-pkgdata_DATA = *.acd |
65 |
+pkgdata_DATA = $(srcdir)/*.acd |
66 |
pkgdatadir=$(prefix)/share/EMBOSS/acd |
67 |
-diff --git a/src/Makefile.am b/src/Makefile.am |
68 |
-index 1883ce9..fb1787f 100644 |
69 |
--- a/src/Makefile.am |
70 |
+++ b/src/Makefile.am |
71 |
-@@ -16,10 +16,7 @@ AM_CPPFLAGS = -I../include -I../../../nucleus -I../../../ajax/pcre \ |
72 |
+@@ -16,10 +16,7 @@ |
73 |
-I../../../ajax/ensembl -I../../../ajax/ajaxdb \ |
74 |
-I../../../ajax/acd -I../../../plplot |
75 |
else |
76 |
@@ -102,10 +91,21 @@ index 1883ce9..fb1787f 100644 |
77 |
endif |
78 |
|
79 |
if ISSHARED |
80 |
-@@ -120,5 +117,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \ |
81 |
+@@ -34,7 +31,7 @@ |
82 |
+ -lnucleus -lacd -lajaxdb -lensembl -lajaxg -lajax -lepcre \ |
83 |
+ $(NLAIXLIBS) -leplplot |
84 |
+ else |
85 |
+-AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -L${embprefix}/lib -lnucleus -lacd \ |
86 |
++AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -lnucleus -lacd \ |
87 |
+ -lajaxdb -lensembl -lajaxg -lajax -lepcre $(NLAIXLIBS) -leplplot |
88 |
+ endif |
89 |
+ endif |
90 |
+@@ -119,6 +116,6 @@ |
91 |
+ ../../../ajax/pcre/libepcre.la \ |
92 |
../../../plplot/libeplplot.la $(XLIB) |
93 |
else |
94 |
- LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \ |
95 |
+-LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \ |
96 |
- -lajax -lepcre $(NLADD) -leplplot $(XLIB) |
97 |
++LDADD = -lnucleus -lacd -lajaxdb -lensembl -lajaxg \ |
98 |
+ -lajax $(NLADD) $(XLIB) |
99 |
endif |