1 |
jlec 15/03/28 17:24:57 |
2 |
|
3 |
Added: embassy-emnu-1.05.650_fix-build-system.patch |
4 |
Log: |
5 |
Import latest changes from science overlay, thanks Ted Tanberry for the work; fixes #335603 |
6 |
|
7 |
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 sci-biology/embassy-emnu/files/embassy-emnu-1.05.650_fix-build-system.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/embassy-emnu/files/embassy-emnu-1.05.650_fix-build-system.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/embassy-emnu/files/embassy-emnu-1.05.650_fix-build-system.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: embassy-emnu-1.05.650_fix-build-system.patch |
16 |
=================================================================== |
17 |
--- EMNU-1.05.650/configure.ac |
18 |
+++ EMNU-1.05.650/configure.ac |
19 |
@@ -635,33 +635,6 @@ |
20 |
|
21 |
|
22 |
|
23 |
-dnl PCRE library definitions - see the MAJOR and MINOR values |
24 |
-dnl to see which version's configure.in these lines come from |
25 |
- |
26 |
-dnl Provide the current PCRE version information. Do not use numbers |
27 |
-dnl with leading zeros for the minor version, as they end up in a C |
28 |
-dnl macro, and may be treated as octal constants. Stick to single |
29 |
-dnl digits for minor numbers less than 10. There are unlikely to be |
30 |
-dnl that many releases anyway. |
31 |
- |
32 |
-PCRE_MAJOR="7" |
33 |
-PCRE_MINOR="9" |
34 |
-PCRE_DATE="11-Apr-2009" |
35 |
-PCRE_VERSION="${PCRE_MAJOR}.${PCRE_MINOR}" |
36 |
- |
37 |
-dnl Default values for miscellaneous macros |
38 |
- |
39 |
-POSIX_MALLOC_THRESHOLD="-DPOSIX_MALLOC_THRESHOLD=10" |
40 |
- |
41 |
-dnl Provide versioning information for libtool shared libraries that |
42 |
-dnl are built by default on Unix systems. |
43 |
- |
44 |
-PCRE_LIB_VERSION="0:1:0" |
45 |
-PCRE_POSIXLIB_VERSION="0:0:0" |
46 |
- |
47 |
- |
48 |
- |
49 |
- |
50 |
dnl FIXME: This does no longer seem required with Autoconf 2.67? |
51 |
dnl Intel MacOSX 10.6 puts X11 in a non-standard place |
52 |
dnl AS_IF([test "x${with_x}" != "xno"], |
53 |
@@ -737,21 +710,6 @@ |
54 |
|
55 |
|
56 |
|
57 |
-dnl "Export" these variables for PCRE |
58 |
- |
59 |
-AC_SUBST([HAVE_MEMMOVE]) |
60 |
-AC_SUBST([HAVE_STRERROR]) |
61 |
-AC_SUBST([PCRE_MAJOR]) |
62 |
-AC_SUBST([PCRE_MINOR]) |
63 |
-AC_SUBST([PCRE_DATE]) |
64 |
-AC_SUBST([PCRE_VERSION]) |
65 |
-AC_SUBST([PCRE_LIB_VERSION]) |
66 |
-AC_SUBST([PCRE_POSIXLIB_VERSION]) |
67 |
-AC_SUBST([POSIX_MALLOC_THRESHOLD]) |
68 |
- |
69 |
- |
70 |
- |
71 |
- |
72 |
dnl Test if --enable-localforce given |
73 |
locallink="no" |
74 |
embprefix="/usr/local" |
75 |
@@ -874,6 +832,11 @@ |
76 |
AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"]) |
77 |
|
78 |
|
79 |
+AS_IF([test "x${enable_systemlibs}" = "xyes"], |
80 |
+[ |
81 |
+dnl using system libraries |
82 |
+ PKG_CHECK_MODULES([PLPLOT], [plplotd]) |
83 |
+]) |
84 |
|
85 |
|
86 |
# Enable the purify tool: --enable-purify, sets CC and LIBTOOL |
87 |
@@ -899,20 +862,16 @@ |
88 |
|
89 |
|
90 |
dnl emnu and mse only: uses curses |
91 |
-dnl Test if --with-curses is given |
92 |
-AC_ARG_WITH([curses], |
93 |
-[AS_HELP_STRING([--with-curses], [curses (or ncurses)])]) |
94 |
- |
95 |
-AC_MSG_CHECKING([for curses]) |
96 |
- |
97 |
-AS_IF([test "${with_curses}"], |
98 |
-[ |
99 |
- CPPFLAGS="$CPPFLAGS -I${with_curses}/include -I${with_curses}/include/ncurses" |
100 |
- LDFLAGS="$LDFLAGS -L${with_curses}/lib" |
101 |
+dnl Test if --enable-curses is given |
102 |
+AC_ARG_ENABLE([curses], |
103 |
+[AS_HELP_STRING([--enable-curses], [curses])]) |
104 |
+ |
105 |
+AS_IF([test "x$enable_curses" = "xyes"], [ |
106 |
+ PKG_CHECK_MODULES([NCURSES], [ncurses]) |
107 |
+ PKG_CHECK_MODULES([FORM], [form]) |
108 |
+ PKG_CHECK_MODULES([MENU], [menu]) |
109 |
]) |
110 |
|
111 |
-AC_CHECK_LIB([ncurses], [main], [LIBS="$LIBS -lncurses"], [LIBS="$LIBS -lcurses"]) |
112 |
- |
113 |
|
114 |
|
115 |
|
116 |
--- EMNU-1.05.650/src/Makefile.am |
117 |
+++ EMNU-1.05.650/src/Makefile.am |
118 |
@@ -17,9 +17,8 @@ |
119 |
-I../../../ajax/ensembl -I../../../ajax/ajaxdb \ |
120 |
-I../../../ajax/acd -I../../../plplot |
121 |
else |
122 |
-AM_CPPFLAGS = -I${embprefix}/include -I${embprefix}/include/eplplot \ |
123 |
- $(NLINCLUDES) \ |
124 |
- -I${embprefix}/include/epcre |
125 |
+AM_CPPFLAGS = -I${embprefix}/include $(NLINCLUDES) $(PLPLOT_CFLAGS) \ |
126 |
+ $(NCURSES_CFLAGS) $(FORM_CFLAGS) $(MENU_CFLAGS) |
127 |
endif |
128 |
|
129 |
if ISSHARED |
130 |
@@ -57,5 +56,5 @@ |
131 |
../../../plplot/libeplplot.la -lmenu -lform $(XLIB) |
132 |
else |
133 |
LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \ |
134 |
- -lajax -lepcre $(NLADD) -leplplot -lmenu -lform $(XLIB) |
135 |
+ -lajax $(NLADD) $(NCURSES_LIBS) $(FORM_LIBS) $(MENU_LIBS) $(XLIB) |
136 |
endif |
137 |
--- EMNU-1.05.650/emboss_acd/Makefile.am |
138 |
+++ EMNU-1.05.650/emboss_acd/Makefile.am |
139 |
@@ -1,3 +1,3 @@ |
140 |
|
141 |
-pkgdata_DATA = *.acd |
142 |
+pkgdata_DATA = $(srcdir)/*.acd |
143 |
pkgdatadir=$(prefix)/share/EMBOSS/acd |