summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2015-06-21 09:18:26 +0000
committerJustin Lecher <jlec@gentoo.org>2015-06-21 09:18:26 +0000
commit6fef90aae16290e1dd799dcbf032cc6a17eecf61 (patch)
tree874b9f240bdbad43cd163eaa7bc411286e9bff17 /sci-biology/embassy-vienna
parentDrop unneeded -ppc. (diff)
downloadgentoo-2-6fef90aae16290e1dd799dcbf032cc6a17eecf61.tar.gz
gentoo-2-6fef90aae16290e1dd799dcbf032cc6a17eecf61.tar.bz2
gentoo-2-6fef90aae16290e1dd799dcbf032cc6a17eecf61.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/embassy-vienna')
-rw-r--r--sci-biology/embassy-vienna/ChangeLog6
-rw-r--r--sci-biology/embassy-vienna/files/embassy-vienna-1.7.2.650_fix-build-system.patch32
2 files changed, 26 insertions, 12 deletions
diff --git a/sci-biology/embassy-vienna/ChangeLog b/sci-biology/embassy-vienna/ChangeLog
index 2133af5a45c0..ec10ac284092 100644
--- a/sci-biology/embassy-vienna/ChangeLog
+++ b/sci-biology/embassy-vienna/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-biology/embassy-vienna
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-vienna/ChangeLog,v 1.12 2015/03/28 17:55:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-vienna/ChangeLog,v 1.13 2015/06/21 09:18:26 jlec Exp $
+
+ 21 Jun 2015; Justin Lecher <jlec@gentoo.org>
+ files/embassy-vienna-1.7.2.650_fix-build-system.patch:
+ Update buildsystem for latest plplot, bug #552492
28 Mar 2015; Justin Lecher <jlec@gentoo.org> -embassy-vienna-1.7.2-r1.ebuild,
embassy-vienna-1.7.2.650.ebuild:
diff --git a/sci-biology/embassy-vienna/files/embassy-vienna-1.7.2.650_fix-build-system.patch b/sci-biology/embassy-vienna/files/embassy-vienna-1.7.2.650_fix-build-system.patch
index c9ece691229c..5ce365ed5497 100644
--- a/sci-biology/embassy-vienna/files/embassy-vienna-1.7.2.650_fix-build-system.patch
+++ b/sci-biology/embassy-vienna/files/embassy-vienna-1.7.2.650_fix-build-system.patch
@@ -1,6 +1,12 @@
---- VIENNA-1.7.2.650/configure.ac
-+++ VIENNA-1.7.2.650/configure.ac
-@@ -649,33 +649,6 @@
+ configure.ac | 49 +++++++------------------------------------------
+ src/Makefile.am | 7 +++----
+ 2 files changed, 10 insertions(+), 46 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f5a4ecf..bbe0743 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -649,33 +649,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"],
-@@ -751,21 +724,6 @@
+@@ -751,21 +724,6 @@ AX_LIB_POSTGRESQL
@@ -56,21 +62,25 @@
dnl Test if --enable-localforce given
locallink="no"
embprefix="/usr/local"
-@@ -888,6 +846,11 @@
+@@ -888,6 +846,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
---- VIENNA-1.7.2.650/src/Makefile.am
-+++ VIENNA-1.7.2.650/src/Makefile.am
-@@ -32,9 +32,7 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 1f5b756..e178914 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -32,9 +32,7 @@ AM_CPPFLAGS = -I../H -I../../../nucleus -I../../../ajax/pcre \
-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
-I../../../ajax/acd -I../../../plplot
else
@@ -81,7 +91,7 @@
endif
if ISSHARED
-@@ -87,6 +85,7 @@
+@@ -87,6 +85,7 @@ LINKFLAGS = $(VERS_INF)
endif
liboviennarna_la_LDFLAGS = $(LINKFLAGS)
@@ -89,7 +99,7 @@
ovrnaalifold_SOURCES = vrnaalifold.c
ovrnaalifoldpf_SOURCES = vrnaalifoldpf.c
-@@ -119,5 +118,5 @@
+@@ -119,5 +118,5 @@ LDADD = liboviennarna.la \
$(XLIB)
else
LDADD = liboviennarna.la -L${embprefix}/lib -lnucleus -lacd -lajaxdb \