diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2015-06-21 08:41:14 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2015-06-21 08:41:14 +0000 |
| commit | 5ed9423f6d7c5781457a361263e8f84dfc99a67f (patch) | |
| tree | 0827576f73c905f151be0f0d52718a5ec239ff8f | |
| parent | Stable for PPC64 (bug #551814). (diff) | |
| download | gentoo-2-5ed9423f6d7c5781457a361263e8f84dfc99a67f.tar.gz gentoo-2-5ed9423f6d7c5781457a361263e8f84dfc99a67f.tar.bz2 gentoo-2-5ed9423f6d7c5781457a361263e8f84dfc99a67f.zip | |
Update buildsystem for latest plplot, bug #552492
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)
| -rw-r--r-- | sci-biology/embassy-clustalomega/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-biology/embassy-clustalomega/files/embassy-clustalomega-1.1.0_fix-build-system.patch | 30 |
2 files changed, 25 insertions, 11 deletions
diff --git a/sci-biology/embassy-clustalomega/ChangeLog b/sci-biology/embassy-clustalomega/ChangeLog index 05a053fd0998..d95b39436521 100644 --- a/sci-biology/embassy-clustalomega/ChangeLog +++ b/sci-biology/embassy-clustalomega/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-biology/embassy-clustalomega # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-clustalomega/ChangeLog,v 1.2 2015/03/28 17:56:03 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-clustalomega/ChangeLog,v 1.3 2015/06/21 08:41:14 jlec Exp $ + + 21 Jun 2015; Justin Lecher <jlec@gentoo.org> + files/embassy-clustalomega-1.1.0_fix-build-system.patch: + Update buildsystem for latest plplot, bug #552492 28 Mar 2015; Justin Lecher <jlec@gentoo.org> embassy-clustalomega-1.1.0.ebuild: diff --git a/sci-biology/embassy-clustalomega/files/embassy-clustalomega-1.1.0_fix-build-system.patch b/sci-biology/embassy-clustalomega/files/embassy-clustalomega-1.1.0_fix-build-system.patch index 7847da78ac4a..5525d79b525f 100644 --- a/sci-biology/embassy-clustalomega/files/embassy-clustalomega-1.1.0_fix-build-system.patch +++ b/sci-biology/embassy-clustalomega/files/embassy-clustalomega-1.1.0_fix-build-system.patch @@ -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 \ |