diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2015-06-21 08:46:54 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2015-06-21 08:46:54 +0000 |
| commit | 8a7ada0a7db1717bd8c9b00ca44049e7e21882a7 (patch) | |
| tree | 06f32a901ff0c5869513af4f2d9408b5186097b9 /sci-biology | |
| parent | Stable for PPC64 (bug #551814). (diff) | |
| download | gentoo-2-8a7ada0a7db1717bd8c9b00ca44049e7e21882a7.tar.gz gentoo-2-8a7ada0a7db1717bd8c9b00ca44049e7e21882a7.tar.bz2 gentoo-2-8a7ada0a7db1717bd8c9b00ca44049e7e21882a7.zip | |
Update buildsystem for latest plplot, bug #552492
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)
Diffstat (limited to 'sci-biology')
| -rw-r--r-- | sci-biology/embassy-domainatrix/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-biology/embassy-domainatrix/files/embassy-domainatrix-0.1.650_fix-build-system.patch | 31 |
2 files changed, 25 insertions, 12 deletions
diff --git a/sci-biology/embassy-domainatrix/ChangeLog b/sci-biology/embassy-domainatrix/ChangeLog index e28526fd1b09..20d34e510e16 100644 --- a/sci-biology/embassy-domainatrix/ChangeLog +++ b/sci-biology/embassy-domainatrix/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-biology/embassy-domainatrix # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-domainatrix/ChangeLog,v 1.34 2015/03/28 17:57:09 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-domainatrix/ChangeLog,v 1.35 2015/06/21 08:46:54 jlec Exp $ + + 21 Jun 2015; Justin Lecher <jlec@gentoo.org> + files/embassy-domainatrix-0.1.650_fix-build-system.patch: + Update buildsystem for latest plplot, bug #552492 28 Mar 2015; Justin Lecher <jlec@gentoo.org> -embassy-domainatrix-0.1.0-r4.ebuild, embassy-domainatrix-0.1.650.ebuild: diff --git a/sci-biology/embassy-domainatrix/files/embassy-domainatrix-0.1.650_fix-build-system.patch b/sci-biology/embassy-domainatrix/files/embassy-domainatrix-0.1.650_fix-build-system.patch index f76b0237c7de..a932e1ebe21e 100644 --- a/sci-biology/embassy-domainatrix/files/embassy-domainatrix-0.1.650_fix-build-system.patch +++ b/sci-biology/embassy-domainatrix/files/embassy-domainatrix-0.1.650_fix-build-system.patch @@ -1,6 +1,12 @@ ---- DOMAINATRIX-0.1.650/configure.ac -+++ DOMAINATRIX-0.1.650/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 d16cc02..d327a0d 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 ---- DOMAINATRIX-0.1.650/src/Makefile.am -+++ DOMAINATRIX-0.1.650/src/Makefile.am -@@ -17,9 +17,7 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index d405d00..54be7ca 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,11 +91,10 @@ endif if ISSHARED -@@ -64,5 +62,5 @@ +@@ -64,5 +62,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \ $(XLIB) else LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \ - -lajax -lepcre $(NLADD) -leplplot $(XLIB) + -lajax $(NLADD) $(XLIB) endif - |