1 |
commit: 6e8ffa30b0e494f08d1c6e923e16ca66c9327276 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 2 22:10:59 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 2 22:10:59 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e8ffa30 |
7 |
|
8 |
sci-biology/embassy-emnu: Patch out -L/usr/lib for LLD |
9 |
|
10 |
Closes: https://bugs.gentoo.org/731750 |
11 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
13 |
|
14 |
.../embassy-emnu-1.05.650_fix-build-system.patch | 45 +++++++++++----------- |
15 |
1 file changed, 23 insertions(+), 22 deletions(-) |
16 |
|
17 |
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 |
18 |
index 4e14bac1704..ecd7f928da3 100644 |
19 |
--- a/sci-biology/embassy-emnu/files/embassy-emnu-1.05.650_fix-build-system.patch |
20 |
+++ b/sci-biology/embassy-emnu/files/embassy-emnu-1.05.650_fix-build-system.patch |
21 |
@@ -1,13 +1,6 @@ |
22 |
- configure.ac | 67 +++++++++++--------------------------------------- |
23 |
- emboss_acd/Makefile.am | 2 +- |
24 |
- src/Makefile.am | 7 +++--- |
25 |
- 3 files changed, 18 insertions(+), 58 deletions(-) |
26 |
- |
27 |
-diff --git a/configure.ac b/configure.ac |
28 |
-index 7482ade..b815bdb 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 7482ade..b815bdb 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 |
-@@ -737,21 +710,6 @@ AX_LIB_POSTGRESQL |
41 |
+@@ -737,21 +710,6 @@ |
42 |
|
43 |
|
44 |
|
45 |
@@ -63,7 +56,7 @@ index 7482ade..b815bdb 100644 |
46 |
dnl Test if --enable-localforce given |
47 |
locallink="no" |
48 |
embprefix="/usr/local" |
49 |
-@@ -874,6 +832,13 @@ AC_ARG_ENABLE([systemlibs], |
50 |
+@@ -874,6 +832,13 @@ |
51 |
AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"]) |
52 |
|
53 |
|
54 |
@@ -77,23 +70,24 @@ index 7482ade..b815bdb 100644 |
55 |
|
56 |
|
57 |
# Enable the purify tool: --enable-purify, sets CC and LIBTOOL |
58 |
-@@ -899,20 +864,16 @@ dnl fi |
59 |
+@@ -899,20 +864,16 @@ |
60 |
|
61 |
|
62 |
dnl emnu and mse only: uses curses |
63 |
-dnl Test if --with-curses is given |
64 |
-AC_ARG_WITH([curses], |
65 |
-[AS_HELP_STRING([--with-curses], [curses (or ncurses)])]) |
66 |
-+dnl Test if --enable-curses is given |
67 |
-+AC_ARG_ENABLE([curses], |
68 |
-+[AS_HELP_STRING([--enable-curses], [curses])]) |
69 |
- |
70 |
+- |
71 |
-AC_MSG_CHECKING([for curses]) |
72 |
- |
73 |
-AS_IF([test "${with_curses}"], |
74 |
-[ |
75 |
- CPPFLAGS="$CPPFLAGS -I${with_curses}/include -I${with_curses}/include/ncurses" |
76 |
- LDFLAGS="$LDFLAGS -L${with_curses}/lib" |
77 |
++dnl Test if --enable-curses is given |
78 |
++AC_ARG_ENABLE([curses], |
79 |
++[AS_HELP_STRING([--enable-curses], [curses])]) |
80 |
++ |
81 |
+AS_IF([test "x$enable_curses" = "xyes"], [ |
82 |
+ PKG_CHECK_MODULES([NCURSES], [ncurses]) |
83 |
+ PKG_CHECK_MODULES([FORM], [form]) |
84 |
@@ -105,8 +99,6 @@ index 7482ade..b815bdb 100644 |
85 |
|
86 |
|
87 |
|
88 |
-diff --git a/emboss_acd/Makefile.am b/emboss_acd/Makefile.am |
89 |
-index e1c1878..e253c95 100644 |
90 |
--- a/emboss_acd/Makefile.am |
91 |
+++ b/emboss_acd/Makefile.am |
92 |
@@ -1,3 +1,3 @@ |
93 |
@@ -114,11 +106,9 @@ index e1c1878..e253c95 100644 |
94 |
-pkgdata_DATA = *.acd |
95 |
+pkgdata_DATA = $(srcdir)/*.acd |
96 |
pkgdatadir=$(prefix)/share/EMBOSS/acd |
97 |
-diff --git a/src/Makefile.am b/src/Makefile.am |
98 |
-index b295079..330c76f 100644 |
99 |
--- a/src/Makefile.am |
100 |
+++ b/src/Makefile.am |
101 |
-@@ -17,9 +17,8 @@ AM_CPPFLAGS = -I../../../nucleus -I../../../ajax/pcre \ |
102 |
+@@ -17,9 +17,8 @@ |
103 |
-I../../../ajax/ensembl -I../../../ajax/ajaxdb \ |
104 |
-I../../../ajax/acd -I../../../plplot |
105 |
else |
106 |
@@ -130,10 +120,21 @@ index b295079..330c76f 100644 |
107 |
endif |
108 |
|
109 |
if ISSHARED |
110 |
-@@ -57,5 +56,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \ |
111 |
+@@ -34,7 +33,7 @@ |
112 |
+ -lnucleus -lacd -lajaxdb -lensembl -lajaxg -lajax -lepcre \ |
113 |
+ $(NLAIXLIBS) -leplplot |
114 |
+ else |
115 |
+-AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -L${embprefix}/lib -lnucleus -lacd \ |
116 |
++AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -lnucleus -lacd \ |
117 |
+ -lajaxdb -lensembl -lajaxg -lajax -lepcre $(NLAIXLIBS) -leplplot |
118 |
+ endif |
119 |
+ endif |
120 |
+@@ -56,6 +55,6 @@ |
121 |
+ ../../../ajax/pcre/libepcre.la \ |
122 |
../../../plplot/libeplplot.la -lmenu -lform $(XLIB) |
123 |
else |
124 |
- LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \ |
125 |
+-LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \ |
126 |
- -lajax -lepcre $(NLADD) -leplplot -lmenu -lform $(XLIB) |
127 |
++LDADD = -lnucleus -lacd -lajaxdb -lensembl -lajaxg \ |
128 |
+ -lajax $(NLADD) $(NCURSES_LIBS) $(FORM_LIBS) $(MENU_LIBS) $(XLIB) |
129 |
endif |