* [gentoo-commits] gentoo-x86 commit in sci-biology/embassy-clustalomega/files: embassy-clustalomega-1.1.0_fix-build-system.patch
@ 2015-03-28 17:33 Justin Lecher (jlec)
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher (jlec) @ 2015-03-28 17:33 UTC (permalink / raw
To: gentoo-commits
jlec 15/03/28 17:33:53
Added: embassy-clustalomega-1.1.0_fix-build-system.patch
Log:
Import latest changes from science overlay, thanks Ted Tanberry for the work; fixes #335603
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path
1.1 sci-biology/embassy-clustalomega/files/embassy-clustalomega-1.1.0_fix-build-system.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/embassy-clustalomega/files/embassy-clustalomega-1.1.0_fix-build-system.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/embassy-clustalomega/files/embassy-clustalomega-1.1.0_fix-build-system.patch?rev=1.1&content-type=text/plain
Index: embassy-clustalomega-1.1.0_fix-build-system.patch
===================================================================
--- CLUSTALOMEGA-1.1.0/configure.ac
+++ CLUSTALOMEGA-1.1.0/configure.ac
@@ -635,33 +635,6 @@
-dnl PCRE library definitions - see the MAJOR and MINOR values
-dnl to see which version's configure.in these lines come from
-
-dnl Provide the current PCRE version information. Do not use numbers
-dnl with leading zeros for the minor version, as they end up in a C
-dnl macro, and may be treated as octal constants. Stick to single
-dnl digits for minor numbers less than 10. There are unlikely to be
-dnl that many releases anyway.
-
-PCRE_MAJOR="7"
-PCRE_MINOR="9"
-PCRE_DATE="11-Apr-2009"
-PCRE_VERSION="${PCRE_MAJOR}.${PCRE_MINOR}"
-
-dnl Default values for miscellaneous macros
-
-POSIX_MALLOC_THRESHOLD="-DPOSIX_MALLOC_THRESHOLD=10"
-
-dnl Provide versioning information for libtool shared libraries that
-dnl are built by default on Unix systems.
-
-PCRE_LIB_VERSION="0:1:0"
-PCRE_POSIXLIB_VERSION="0:0:0"
-
-
-
-
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 @@
-dnl "Export" these variables for PCRE
-
-AC_SUBST([HAVE_MEMMOVE])
-AC_SUBST([HAVE_STRERROR])
-AC_SUBST([PCRE_MAJOR])
-AC_SUBST([PCRE_MINOR])
-AC_SUBST([PCRE_DATE])
-AC_SUBST([PCRE_VERSION])
-AC_SUBST([PCRE_LIB_VERSION])
-AC_SUBST([PCRE_POSIXLIB_VERSION])
-AC_SUBST([POSIX_MALLOC_THRESHOLD])
-
-
-
-
dnl Test if --enable-localforce given
locallink="no"
embprefix="/usr/local"
@@ -874,6 +832,11 @@
AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"])
+AS_IF([test "x${enable_systemlibs}" = "xyes"],
+[
+dnl using system libraries
+ PKG_CHECK_MODULES([PLPLOT], [plplotd])
+])
# Enable the purify tool: --enable-purify, sets CC and LIBTOOL
--- CLUSTALOMEGA-1.1.0/src/Makefile.am
+++ CLUSTALOMEGA-1.1.0/src/Makefile.am
@@ -17,9 +17,7 @@
-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
-I../../../ajax/acd -I../../../plplot
else
-AM_CPPFLAGS = -I${embprefix}/include -I${embprefix}/include/eplplot \
- $(NLINCLUDES) \
- -I${embprefix}/include/epcre
+AM_CPPFLAGS = -I${embprefix}/include $(NLINCLUDES) $(PLPLOT_CFLAGS)
endif
if ISSHARED
@@ -62,5 +60,5 @@
$(XLIB)
else
LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
- -lajax -lepcre $(NLADD) -leplplot $(XLIB)
+ -lajax $(NLADD) $(XLIB)
endif
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-biology/embassy-clustalomega/files: embassy-clustalomega-1.1.0_fix-build-system.patch
@ 2015-06-21 8:41 Justin Lecher (jlec)
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher (jlec) @ 2015-06-21 8:41 UTC (permalink / raw
To: gentoo-commits
jlec 15/06/21 08:41:14
Modified: embassy-clustalomega-1.1.0_fix-build-system.patch
Log:
Update buildsystem for latest plplot, bug #552492
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)
Revision Changes Path
1.2 sci-biology/embassy-clustalomega/files/embassy-clustalomega-1.1.0_fix-build-system.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/embassy-clustalomega/files/embassy-clustalomega-1.1.0_fix-build-system.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/embassy-clustalomega/files/embassy-clustalomega-1.1.0_fix-build-system.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/embassy-clustalomega/files/embassy-clustalomega-1.1.0_fix-build-system.patch?r1=1.1&r2=1.2
Index: embassy-clustalomega-1.1.0_fix-build-system.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-biology/embassy-clustalomega/files/embassy-clustalomega-1.1.0_fix-build-system.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- embassy-clustalomega-1.1.0_fix-build-system.patch 28 Mar 2015 17:33:53 -0000 1.1
+++ embassy-clustalomega-1.1.0_fix-build-system.patch 21 Jun 2015 08:41:14 -0000 1.2
@@ -1,6 +1,12 @@
---- CLUSTALOMEGA-1.1.0/configure.ac
-+++ CLUSTALOMEGA-1.1.0/configure.ac
-@@ -635,33 +635,6 @@
+ configure.ac | 49 +++++++------------------------------------------
+ src/Makefile.am | 6 ++----
+ 2 files changed, 9 insertions(+), 46 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f12ed19..b143922 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
@@ -34,7 +40,7 @@
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 @@
+@@ -737,21 +710,6 @@ AX_LIB_POSTGRESQL
@@ -56,21 +62,25 @@
dnl Test if --enable-localforce given
locallink="no"
embprefix="/usr/local"
-@@ -874,6 +832,11 @@
+@@ -874,6 +832,13 @@ AC_ARG_ENABLE([systemlibs],
AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"])
+AS_IF([test "x${enable_systemlibs}" = "xyes"],
+[
+dnl using system libraries
-+ PKG_CHECK_MODULES([PLPLOT], [plplotd])
++ PKG_CHECK_MODULES([PLPLOT], [plplotd],
++ [],[PKG_CHECK_MODULES([PLPLOT], [plplot])]
++ )
+])
# Enable the purify tool: --enable-purify, sets CC and LIBTOOL
---- CLUSTALOMEGA-1.1.0/src/Makefile.am
-+++ CLUSTALOMEGA-1.1.0/src/Makefile.am
-@@ -17,9 +17,7 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 9135679..c201149 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -17,9 +17,7 @@ AM_CPPFLAGS = -I../../../nucleus -I../../../ajax/pcre \
-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
-I../../../ajax/acd -I../../../plplot
else
@@ -81,7 +91,7 @@
endif
if ISSHARED
-@@ -62,5 +60,5 @@
+@@ -62,5 +60,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \
$(XLIB)
else
LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-06-21 8:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-21 8:41 [gentoo-commits] gentoo-x86 commit in sci-biology/embassy-clustalomega/files: embassy-clustalomega-1.1.0_fix-build-system.patch Justin Lecher (jlec)
-- strict thread matches above, loose matches on Subject: below --
2015-03-28 17:33 Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox