diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2013-02-27 16:46:49 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2013-02-27 16:46:49 +0000 |
| commit | 566610cadcfdacb10791986bb7f06726db56b1dc (patch) | |
| tree | 69b975c7125f404aa4b05a28bb6cf60b79e2c90c /sci-libs | |
| parent | sci-chemistry/ambertools: Add missing dep on virtual/pkgconfig (diff) | |
| download | gentoo-2-566610cadcfdacb10791986bb7f06726db56b1dc.tar.gz gentoo-2-566610cadcfdacb10791986bb7f06726db56b1dc.tar.bz2 gentoo-2-566610cadcfdacb10791986bb7f06726db56b1dc.zip | |
sci-libs/ccp4-libs: Use PKG_CONFIG instead of generic pkg-config
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)
Diffstat (limited to 'sci-libs')
| -rw-r--r-- | sci-libs/ccp4-libs/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-libs/ccp4-libs/ccp4-libs-6.1.3-r11.ebuild | 4 | ||||
| -rw-r--r-- | sci-libs/ccp4-libs/files/6.1.3-lapack.patch | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/sci-libs/ccp4-libs/ChangeLog b/sci-libs/ccp4-libs/ChangeLog index 4717531addc1..79b3660d3f39 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.53 2013/02/27 14:44:59 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v 1.54 2013/02/27 16:46:49 jlec Exp $ + + 27 Feb 2013; Justin Lecher <jlec@gentoo.org> files/6.1.3-lapack.patch, + ccp4-libs-6.1.3-r11.ebuild: + Use PKG_CONFIG instead of generic pkg-config 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 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 0dcc6d9b665b..8abeed9c1921 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.9 2013/02/27 14:44:59 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r11.ebuild,v 1.10 2013/02/27 16:46:49 jlec Exp $ EAPI=3 @@ -60,6 +60,8 @@ pkg_setup() { } src_prepare() { + tc-export PKG_CONFIG + einfo "Applying upstream patches ..." for patch in $(seq $PATCH_TOT); do base="PATCH${patch}" diff --git a/sci-libs/ccp4-libs/files/6.1.3-lapack.patch b/sci-libs/ccp4-libs/files/6.1.3-lapack.patch index 2514733f876d..0463b3719525 100644 --- a/sci-libs/ccp4-libs/files/6.1.3-lapack.patch +++ b/sci-libs/ccp4-libs/files/6.1.3-lapack.patch @@ -567,10 +567,10 @@ index 833f483..bcfa62d 100755 + # gentoo is clever + make_blas= + make_lapack= -+ BLASLIB=$(pkg-config --libs lapack) -+ LAPACKLIB=$(pkg-config --libs lapack) ++ BLASLIB=$(${PKG_CONFIG} --libs lapack) ++ LAPACKLIB=$(${PKG_CONFIG} --libs lapack) + XLAPACK_LIB="${BLASLIB} ${LAPACKLIB}" -+ XFFLAGS_LAPACK="$(pkg-config --cflags lapack blas)" ++ XFFLAGS_LAPACK="$(${PKG_CONFIG} --cflags lapack blas)" # Otherwise force building of NetLib BLAS and LAPACK libs - else - echo |