summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2013-02-27 16:50:37 +0000
committerJustin Lecher <jlec@gentoo.org>2013-02-27 16:50:37 +0000
commit784bf8d4d386f42b28abb365ebb23de160425400 (patch)
tree9c629fb9b2e61c89dc9cb914d51e1ce73b713e75 /sci-libs
parentsci-libs/ccp4-libs: Use PKG_CONFIG instead of generic pkg-config (diff)
downloadgentoo-2-784bf8d4d386f42b28abb365ebb23de160425400.tar.gz
gentoo-2-784bf8d4d386f42b28abb365ebb23de160425400.tar.bz2
gentoo-2-784bf8d4d386f42b28abb365ebb23de160425400.zip
sci-libs/arpack: Use detected pkg-config instead of generic
(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/arpack/ChangeLog6
-rw-r--r--sci-libs/arpack/arpack-3.1.2-r1.ebuild3
-rw-r--r--sci-libs/arpack/files/arpack-3.1.2-test.patch12
3 files changed, 13 insertions, 8 deletions
diff --git a/sci-libs/arpack/ChangeLog b/sci-libs/arpack/ChangeLog
index a9db4d2e4a93..86871635e74b 100644
--- a/sci-libs/arpack/ChangeLog
+++ b/sci-libs/arpack/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-libs/arpack
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/ChangeLog,v 1.50 2013/02/21 16:50:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/ChangeLog,v 1.51 2013/02/27 16:50:37 jlec Exp $
+
+ 27 Feb 2013; Justin Lecher <jlec@gentoo.org> arpack-3.1.2-r1.ebuild,
+ files/arpack-3.1.2-test.patch:
+ Use detected pkg-config instead of generic
*arpack-3.1.2-r1 (21 Feb 2013)
diff --git a/sci-libs/arpack/arpack-3.1.2-r1.ebuild b/sci-libs/arpack/arpack-3.1.2-r1.ebuild
index 967b834c8503..793b5da3a0ad 100644
--- a/sci-libs/arpack/arpack-3.1.2-r1.ebuild
+++ b/sci-libs/arpack/arpack-3.1.2-r1.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/arpack/arpack-3.1.2-r1.ebuild,v 1.1 2013/02/21 16:50:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/arpack-3.1.2-r1.ebuild,v 1.2 2013/02/27 16:50:37 jlec Exp $
EAPI=5
@@ -36,6 +36,7 @@ PATCHES=(
)
src_configure() {
+ tc-export PKG_CONFIG
local myeconfargs=(
--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
diff --git a/sci-libs/arpack/files/arpack-3.1.2-test.patch b/sci-libs/arpack/files/arpack-3.1.2-test.patch
index 434fdb5b6c1b..831862405762 100644
--- a/sci-libs/arpack/files/arpack-3.1.2-test.patch
+++ b/sci-libs/arpack/files/arpack-3.1.2-test.patch
@@ -18,19 +18,19 @@ index 9eb51db..0764b44 100644
#
sssimp: sssimp.o
- $(FC) $(FFLAGS) sssimp.o $(ALIBS) -o sssimp
-+ $(FC) $(FFLAGS) $(LDFLAGS) sssimp.o $(ALIBS) -o sssimp `pkg-config --libs blas lapack` -larpack
++ $(FC) $(FFLAGS) $(LDFLAGS) sssimp.o $(ALIBS) -o sssimp `$(PKG_CONFIG) --libs blas lapack` -larpack
dssimp: dssimp.o
- $(FC) $(FFLAGS) dssimp.o $(ALIBS) -o dssimp
-+ $(FC) $(FFLAGS) $(LDFLAGS) dssimp.o $(ALIBS) -o dssimp `pkg-config --libs blas lapack` -larpack
++ $(FC) $(FFLAGS) $(LDFLAGS) dssimp.o $(ALIBS) -o dssimp `$(PKG_CONFIG) --libs blas lapack` -larpack
snsimp: snsimp.o
- $(FC) $(FFLAGS) snsimp.o $(ALIBS) -o snsimp
-+ $(FC) $(FFLAGS) $(LDFLAGS) snsimp.o $(ALIBS) -o snsimp `pkg-config --libs blas lapack` -larpack
++ $(FC) $(FFLAGS) $(LDFLAGS) snsimp.o $(ALIBS) -o snsimp `$(PKG_CONFIG) --libs blas lapack` -larpack
dnsimp: dnsimp.o
- $(FC) $(FFLAGS) dnsimp.o $(ALIBS) -o dnsimp
-+ $(FC) $(FFLAGS) $(LDFLAGS) dnsimp.o $(ALIBS) -o dnsimp `pkg-config --libs blas lapack` -larpack
++ $(FC) $(FFLAGS) $(LDFLAGS) dnsimp.o $(ALIBS) -o dnsimp `$(PKG_CONFIG) --libs blas lapack` -larpack
cnsimp: cnsimp.o
- $(FC) $(FFLAGS) cnsimp.o $(ALIBS) -o cnsimp
-+ $(FC) $(FFLAGS) $(LDFLAGS) cnsimp.o $(ALIBS) -o cnsimp `pkg-config --libs blas lapack` -larpack
++ $(FC) $(FFLAGS) $(LDFLAGS) cnsimp.o $(ALIBS) -o cnsimp `$(PKG_CONFIG) --libs blas lapack` -larpack
znsimp: znsimp.o
- $(FC) $(FFLAGS) znsimp.o $(ALIBS) -o znsimp
-+ $(FC) $(FFLAGS) $(LDFLAGS) znsimp.o $(ALIBS) -o znsimp `pkg-config --libs blas lapack` -larpack
++ $(FC) $(FFLAGS) $(LDFLAGS) znsimp.o $(ALIBS) -o znsimp `$(PKG_CONFIG) --libs blas lapack` -larpack