summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2009-01-14 19:11:07 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2009-01-14 19:11:07 +0000
commit5d36abf3466229707a8b17b4831fa8929cbe24f4 (patch)
tree6f0ff50c1348342448ae9c236c267cde4791a378 /sci-libs
parentavoid double econf (diff)
downloadgentoo-2-5d36abf3466229707a8b17b4831fa8929cbe24f4.tar.gz
gentoo-2-5d36abf3466229707a8b17b4831fa8929cbe24f4.tar.bz2
gentoo-2-5d36abf3466229707a8b17b4831fa8929cbe24f4.zip
Now pkg-config files link to the atlas dirs
(Portage version: 2.2_rc20/cvs/Linux 2.6.25-gentoo-r7 x86_64)
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/blas-atlas/ChangeLog9
-rw-r--r--sci-libs/blas-atlas/blas-atlas-3.9.3.ebuild8
-rw-r--r--sci-libs/blas-atlas/files/blas.pc.in2
-rw-r--r--sci-libs/blas-atlas/files/cblas.pc.in2
4 files changed, 13 insertions, 8 deletions
diff --git a/sci-libs/blas-atlas/ChangeLog b/sci-libs/blas-atlas/ChangeLog
index e0a96f79b72f..7eefefa18469 100644
--- a/sci-libs/blas-atlas/ChangeLog
+++ b/sci-libs/blas-atlas/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sci-libs/blas-atlas
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/ChangeLog,v 1.88 2008/09/23 14:20:11 bicatali Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/ChangeLog,v 1.89 2009/01/14 19:11:06 bicatali Exp $
+
+ 14 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org> files/blas.pc.in,
+ files/cblas.pc.in, blas-atlas-3.9.3.ebuild:
+ Now pkg-config files link to the atlas dirs, also fixed cblas and blas
+ requires
23 Sep 2008; Sébastien Fabbro <bicatali@gentoo.org>
files/eselect.cblas.threaded-atlas:
diff --git a/sci-libs/blas-atlas/blas-atlas-3.9.3.ebuild b/sci-libs/blas-atlas/blas-atlas-3.9.3.ebuild
index b8b0f474bc54..4f7b8b2e0936 100644
--- a/sci-libs/blas-atlas/blas-atlas-3.9.3.ebuild
+++ b/sci-libs/blas-atlas/blas-atlas-3.9.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.9.3.ebuild,v 1.3 2008/08/29 00:35:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.9.3.ebuild,v 1.4 2009/01/14 19:11:06 bicatali Exp $
inherit eutils toolchain-funcs fortran multilib
@@ -155,7 +155,7 @@ src_install () {
cp "${FILESDIR}"/blas.pc.in blas.pc
cp "${FILESDIR}"/cblas.pc.in cblas.pc
sed -i \
- -e "s:@LIBDIR@:$(get_libdir):" \
+ -e "s:@LIBDIR@:$(get_libdir)/blas/atlas:" \
-e "s:@PV@:${PV}:" \
-e "s:@EXTLIBS@:${extlibs}:g" \
-e "s:@THREADLIBS@:${threadlibs}:g" \
@@ -177,7 +177,7 @@ src_install () {
cp "${FILESDIR}"/cblas.pc.in cblas.pc
threadlibs="-lpthread"
sed -i \
- -e "s:@LIBDIR@:$(get_libdir):" \
+ -e "s:@LIBDIR@:$(get_libdir)/blas/threaded-atlas:" \
-e "s:@PV@:${PV}:" \
-e "s:@EXTLIBS@:${extlibs}:g" \
-e "s:@THREADLIBS@:${threadlibs}:g" \
diff --git a/sci-libs/blas-atlas/files/blas.pc.in b/sci-libs/blas-atlas/files/blas.pc.in
index 8c0eefe28acf..5cf74ad09708 100644
--- a/sci-libs/blas-atlas/files/blas.pc.in
+++ b/sci-libs/blas-atlas/files/blas.pc.in
@@ -1,6 +1,6 @@
prefix=/usr
exec_prefix=${prefix}
-libdir=/usr/@LIBDIR@
+libdir=${prefix}/@LIBDIR@
includedir=${prefix}/include
Name: blas
diff --git a/sci-libs/blas-atlas/files/cblas.pc.in b/sci-libs/blas-atlas/files/cblas.pc.in
index d40314043f56..0cc53b237f54 100644
--- a/sci-libs/blas-atlas/files/cblas.pc.in
+++ b/sci-libs/blas-atlas/files/cblas.pc.in
@@ -1,6 +1,6 @@
prefix=/usr
exec_prefix=${prefix}
-libdir=/usr/@LIBDIR@
+libdir=${prefix}/@LIBDIR@
includedir=${prefix}/include
Name: cblas