diff options
-rw-r--r-- | sci-libs/ccp4-libs/ChangeLog | 6 | ||||
-rw-r--r-- | sci-libs/ccp4-libs/ccp4-libs-6.1.3-r11.ebuild | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/sci-libs/ccp4-libs/ChangeLog b/sci-libs/ccp4-libs/ChangeLog index 1824c22c92c8..4717531addc1 100644 --- a/sci-libs/ccp4-libs/ChangeLog +++ b/sci-libs/ccp4-libs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/ccp4-libs # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v 1.52 2013/01/22 18:46:53 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v 1.53 2013/02/27 14:44:59 jlec Exp $ + + 27 Feb 2013; Justin Lecher <jlec@gentoo.org> ccp4-libs-6.1.3-r11.ebuild: + Add missing dep on virtual/pkgconfig; use tc-getPKG_CONFIG instead of generic + pkg-config 22 Jan 2013; Justin Lecher <jlec@gentoo.org> -ccp4-libs-6.1.3-r10.ebuild, metadata.xml: diff --git a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r11.ebuild b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r11.ebuild index 4e2868180333..0dcc6d9b665b 100644 --- a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r11.ebuild +++ b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r11.ebuild,v 1.8 2013/01/22 17:23:28 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r11.ebuild,v 1.9 2013/02/27 14:44:59 jlec Exp $ EAPI=3 @@ -49,7 +49,8 @@ RDEPEND=" virtual/jpeg virtual/lapack virtual/blas" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + virtual/pkgconfig" S="${WORKDIR}/${MY_P}" @@ -192,7 +193,7 @@ src_configure() { export SHARE_LIB="\ $(tc-getCC) ${userldflags} -shared -Wl,-soname,libccp4c.so -o libccp4c.so \${CORELIBOBJS} \${CGENERALOBJS} \${CUCOBJS} \${CMTZOBJS} \${CMAPOBJS} \${CSYMOBJS} -L../ccif/ -lccif $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lm && \ - $(tc-getFC) ${userldflags} -shared -Wl,-soname,libccp4f.so -o libccp4f.so \${FORTRANLOBJS} \${FINTERFACEOBJS} -L../ccif/ -lccif -L. -lccp4c $(pkg-config --libs mmdb) $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lstdc++ -lgfortran -lm" + $(tc-getFC) ${userldflags} -shared -Wl,-soname,libccp4f.so -o libccp4f.so \${FORTRANLOBJS} \${FINTERFACEOBJS} -L../ccif/ -lccif -L. -lccp4c $($(tc-getPKG_CONFIG) --libs mmdb) $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lstdc++ -lgfortran -lm" # Can't use econf, configure rejects unknown options like --prefix ./configure \ |