Forced -Wl,--no-as-needed in the pkg-config files. Now blas and lapack pkg-config point to the static acml directory instead of the dynamic libblas and liblapack

Package-Manager: portage-2.1.4.4

7 files changed, 38 insertions, 12 deletions

diff --git a/sci-libs/acml/ChangeLog b/sci-libs/acml/ChangeLog
index c99c0266e418..8df323034a1b 100644
--- a/sci-libs/acml/ChangeLog
+++ b/sci-libs/acml/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/acml
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v 1.31 2008/01/08 09:46:17 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v 1.32 2008/03/31 14:53:52 bicatali Exp $
+
+  31 Mar 2008; Sébastien Fabbro <bicatali@gentoo.org> files/blas.pc.in,
+  files/lapack.pc.in, acml-3.6.0-r1.ebuild, acml-3.6.1-r1.ebuild,
+  acml-4.0.1.ebuild:
+  Forced -Wl,--no-as-needed in the pkg-config files. Now blas and lapack
+  pkg-config point to the static acml directory instead of the dynamic
+  libblas and liblapack
 
   08 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org> files/blas.pc.in,
   files/lapack.pc.in, acml-3.6.0-r1.ebuild, acml-3.6.1-r1.ebuild,
diff --git a/sci-libs/acml/Manifest b/sci-libs/acml/Manifest
index 87e543e5e1eb..ba72da3f8bea 100644
--- a/sci-libs/acml/Manifest
+++ b/sci-libs/acml/Manifest
@@ -1,5 +1,8 @@
-AUX blas.pc.in 292 RMD160 fd530dc7d07db62890fd4e95624033526bed996b SHA1 c64a7a4499cf7e87bcb82618ef8430e7b844df6d SHA256 c1a952dd9f5cfa31a4d98076740526b95ed1b88f3ff84f50888dfa2cbf7e920d
-AUX lapack.pc.in 289 RMD160 7188a9046f5e95178556c9998aa30195e5bdfae3 SHA1 b96c68ba2d933f7587756358749594440bf8773a SHA256 a4eeee717e97ad5d9d14f65b4ad7e0c11ba9fd35a138719fd115374cfa9e18e8
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX blas.pc.in 305 RMD160 62a53031cccc5d2c222b31b64115e67678190f83 SHA1 c7f53ae385290d996a4a85f6d43f0de3e346387c SHA256 1e87f717f13a36b81faaa12d45bd08e5add3b9f7977a9b6b43105ca10822e2a3
+AUX lapack.pc.in 300 RMD160 c4ba2c1b1dbca275279dec5735d522c4efe1c7e5 SHA1 bf3808b66f98f85407b7bdd0a09fc6588bbc4dfd SHA256 1ed9c723892aa4c614738a1dfda4216ce0d596380d733495b351dd8770c450f5
 DIST acml-3-6-0-gnu-32bit.tgz 9879145 RMD160 bafa6acd1d8a319fb385245559779450c7bdcd66 SHA1 7dad2ce9fb99572da79e127c711aabe29a888298 SHA256 81ee83babf134bc021e5e64983200abf815531ee20ecc5ecc97a30bbdb5cf6dd
 DIST acml-3-6-0-gnu-64bit.tgz 11101900 RMD160 f6d674a4fbf99e79109bb379d1ba5dbaf88ce010 SHA1 6f5aab32f396ac9cf99a9c142d89f0b835cb54f0 SHA256 240cd40c9f9c993c15ec113278faf8689713b45b7626da2d0c369024bec97c03
 DIST acml-3-6-0-ifort-32bit.tgz 17399749 RMD160 c41ebe1b62470858d176c5815e05893ba4caf4ad SHA1 87254fc12032ea9ea49822e00300774d8cda73b8 SHA256 1585df79ced4ecd6fdcbb59b36e2686b61d6faf7b755d5ac5a267eddeff36340
@@ -10,8 +13,15 @@ DIST acml-3-6-1-gfortran-64bit.tgz 20452058 RMD160 8df00704e7ac037dcd55a9207f45d
 DIST acml-4-0-1-gfortran-64bit-int64.tgz 21885486 RMD160 a5811d98744a2662855c85efb2c22ab78f42bee0 SHA1 8bcf5c8a1c4f9bd18f5e197edb1256910c627656 SHA256 aa9d506218c80577c3375e5c9076e786f39d0951426ca2e2ac2356c867db84ea
 DIST acml-4-0-1-gfortran-64bit.tgz 22558344 RMD160 1f2e06eb99568899a9145d27c520043d55b21606 SHA1 87ab9473899caef3bfeae11ebeeb4929e3640a51 SHA256 a1063922d7c8b4bbff3635d19b3757674b225c91c784416f0d7edd0939baf658
 DIST acml-4-0-1-ifort-64bit.tgz 24741959 RMD160 323827cc893de6a524bd8ece8126f4e2b502d0e4 SHA1 bacfddb5ab2359191666871c542ae9933cc93a48 SHA256 ee2553fb850eb0b32105c1df48e2a1d0507db8876003e62c3b7724fd15d5f57e
-EBUILD acml-3.6.0-r1.ebuild 4425 RMD160 72a22f8cc168e17bc2a60a6757f57b9e24199f59 SHA1 3d020719f714e6cf5073a4e247093fad2207113e SHA256 34baed9dcf4d9d1233ad6ba63b05f552d728fbdd45b3b5cb137f5d179311bb6a
-EBUILD acml-3.6.1-r1.ebuild 5183 RMD160 06d5363d56feae7bb84cb300c4324de533ea8db6 SHA1 f693f9afc0cea2a3920b50f5002aba0104a91977 SHA256 f52ac3c08856745e3946534371f52c0f3d7b3b864f452dfcc958f5fb946f085a
-EBUILD acml-4.0.1.ebuild 4866 RMD160 c850b1d5130aef954002db1eab6c1c34660a072d SHA1 641d949c4e4ebf5f08182ed75818edaf2dadfb86 SHA256 0ea0b6f380e6dd33a44076a9a6956d29009e5ce7292bf37306d485746269ba7b
-MISC ChangeLog 6180 RMD160 5deb0f1f03b645a5204694b3e9c8b4ba61a408f7 SHA1 27077a607068d1267a4405768e07d66e1f18a47d SHA256 36afe659996171d336d0f6a34e4d7b623fe10ac88c9ae224500deb4466bb7378
+EBUILD acml-3.6.0-r1.ebuild 4533 RMD160 9fae9c360a7faeb69444fb264d4ce98c6c8c7f94 SHA1 4f9f5082749f912d09ddd2ffd7c38056f1fce8f8 SHA256 4ad23b72a702f816f03940f1ffc6e414073850f02edaecea7a5be3416f9de35e
+EBUILD acml-3.6.1-r1.ebuild 5291 RMD160 ca705ea0d488f7a61f8e9a6c7d5ada6e9a9080ec SHA1 881806aa3423db7c03e94f8d57fef753ddd31c23 SHA256 f8874344f0b4720911de0c08f8a692720d5719e75899440c82a4eca977ebca5e
+EBUILD acml-4.0.1.ebuild 4974 RMD160 e492506659f032f28a2f704f0840209a29a77c3e SHA1 976b8950cef48ce7bbe6b3f4b2a154fa67c71270 SHA256 b086183bd2c007b1a0c13af463041cb6c211606c33aa265a89bd74af308514e1
+MISC ChangeLog 6509 RMD160 f205b8bd284bfce55a9b647577988883abfa6136 SHA1 8c1642f0a4d564f0a2ffc52f70368d9f4bd9e1cb SHA256 78e1c470267b025f256262af99f8acc8b0d496ce59ffb6ba23a634d12c57bbcf
 MISC metadata.xml 812 RMD160 878a52e199a177a1dade27a1ebfdf623a42b7e5d SHA1 24e5f44c01dfc65ac8c699015bb649abf29efcaf SHA256 3597c6694fc8b1f7b57103ffd799dfa077c29444c31d6a5be43ebc0198636cae
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH8PsK1ycZbhPLE2ARAoyiAKCsPz5n8cjex6cCki1kC9rMETecxwCfaHgD
+ylKHnAnwzZw7qOoLZJGhqKU=
+=wx78
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/acml/acml-3.6.0-r1.ebuild b/sci-libs/acml/acml-3.6.0-r1.ebuild
index 7d0349efe685..0138f36c2468 100644
--- a/sci-libs/acml/acml-3.6.0-r1.ebuild
+++ b/sci-libs/acml/acml-3.6.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-3.6.0-r1.ebuild,v 1.7 2008/01/08 09:46:17 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-3.6.0-r1.ebuild,v 1.8 2008/03/31 14:53:52 bicatali Exp $
 
 inherit eutils toolchain-funcs fortran
 
@@ -95,6 +95,7 @@ src_install() {
 		# install profiles
 		ESELECT_PROF=acml-${FORTRANC}
 		local acmldir=${instdir}/${fort}
+		local acmllibs="-lacml -lacml_mv"
 		local libname=${acmldir}/lib/libacml
 		local extlibs
 		local extflags
@@ -102,6 +103,7 @@ src_install() {
 		if [[ ${fort} =~ _mp ]]; then
 			ESELECT_PROF=${ESELECT_PROF}-openmp
 			extlibs="${extlibs} -lpthread"
+			acmllibs="-lacml_mp -lacml_mv"
 			libname=${libname}_mp
 			extflags="${extflags} -openmp"
 		fi
@@ -110,6 +112,7 @@ src_install() {
 			sed -e "s:@LIBDIR@:$(get_libdir):" \
 				-e "s:@PV@:${PV}:" \
 				-e "s:@ACMLDIR@:${acmldir}:g" \
+				-e "s:@ACMLLIBS@:${acmllibs}:g" \
 				-e "s:@EXTLIBS@:${extlibs}:g" \
 				-e "s:@EXTFLAGS@:${extflags}:g" \
 				"${FILESDIR}"/${l}.pc.in > ${l}.pc \
diff --git a/sci-libs/acml/acml-3.6.1-r1.ebuild b/sci-libs/acml/acml-3.6.1-r1.ebuild
index 2b2bc7f5ed76..bec23a3c0192 100644
--- a/sci-libs/acml/acml-3.6.1-r1.ebuild
+++ b/sci-libs/acml/acml-3.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-3.6.1-r1.ebuild,v 1.7 2008/01/08 09:46:17 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-3.6.1-r1.ebuild,v 1.8 2008/03/31 14:53:52 bicatali Exp $
 
 inherit eutils toolchain-funcs fortran
 
@@ -107,6 +107,7 @@ src_install() {
 		# install profiles
 		ESELECT_PROF=acml-${FORTRANC}
 		local acmldir=${instdir}/${fort}
+		local acmllibs="-lacml -lacml_mv"
 		local libname=${acmldir}/lib/libacml
 		local extlibs
 		local extflags
@@ -118,6 +119,7 @@ src_install() {
 		if [[ ${fort} =~ _mp ]]; then
 			ESELECT_PROF=${ESELECT_PROF}-openmp
 			extlibs="${extlibs} -lpthread"
+			acmllibs="-lacml_mp -lacml_mv"
 			libname=${libname}_mp
 			extflags="${extflags} -fopenmp"
 		fi
@@ -126,6 +128,7 @@ src_install() {
 			sed -e "s:@LIBDIR@:$(get_libdir):" \
 				-e "s:@PV@:${PV}:" \
 				-e "s:@ACMLDIR@:${acmldir}:g" \
+				-e "s:@ACMLLIBS@:${acmllibs}:g" \
 				-e "s:@EXTLIBS@:${extlibs}:g" \
 				-e "s:@EXTFLAGS@:${extflags}:g" \
 				"${FILESDIR}"/${l}.pc.in > ${l}.pc \
diff --git a/sci-libs/acml/acml-4.0.1.ebuild b/sci-libs/acml/acml-4.0.1.ebuild
index e7fc3726243e..514ff6fa50d4 100644
--- a/sci-libs/acml/acml-4.0.1.ebuild
+++ b/sci-libs/acml/acml-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-4.0.1.ebuild,v 1.3 2008/01/08 09:46:17 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-4.0.1.ebuild,v 1.4 2008/03/31 14:53:52 bicatali Exp $
 
 inherit eutils toolchain-funcs fortran
 
@@ -107,6 +107,7 @@ src_install() {
 		# install profiles
 		ESELECT_PROF=acml-${FORTRANC}
 		local acmldir=${instdir}/${fort}
+		local acmllibs="-lacml -lacml_mv"
 		local libname=${acmldir}/lib/libacml
 		local extlibs=
 		local extflags=
@@ -118,6 +119,7 @@ src_install() {
 		if [[ ${fort} =~ _mp ]]; then
 			ESELECT_PROF=${ESELECT_PROF}-openmp
 			extlibs="${extlibs} -lpthread"
+			acmllibs="-lacml_mp -lacml_mv"
 			libname=${libname}_mp
 			extflags="${extflags} -fopenmp"
 		fi
@@ -126,6 +128,7 @@ src_install() {
 			sed -e "s:@LIBDIR@:$(get_libdir):" \
 				-e "s:@PV@:${PV}:" \
 				-e "s:@ACMLDIR@:${acmldir}:g" \
+				-e "s:@ACMLLIBS@:${acmllibs}:g" \
 				-e "s:@EXTLIBS@:${extlibs}:g" \
 				-e "s:@EXTFLAGS@:${extflags}:g" \
 				"${FILESDIR}"/${l}.pc.in > ${l}.pc \
diff --git a/sci-libs/acml/files/blas.pc.in b/sci-libs/acml/files/blas.pc.in
index d9f7f4087943..523aabc1204c 100644
--- a/sci-libs/acml/files/blas.pc.in
+++ b/sci-libs/acml/files/blas.pc.in
@@ -7,5 +7,5 @@ Name: blas
 Description: ACML implementations of the Basic Linear Algebra Subroutines
 Version: @PV@
 URL: http://developer.amd.com/acml.jsp
-Libs: -L${libdir} -lblas -lacml_mv @EXTLIBS@
+Libs: -Wl,--no-as-needed -L${libdir} @ACMLLIBS@ @EXTLIBS@
 Cflags: @EXTFLAGS@
diff --git a/sci-libs/acml/files/lapack.pc.in b/sci-libs/acml/files/lapack.pc.in
index d2453f180759..48fef122dfe4 100644
--- a/sci-libs/acml/files/lapack.pc.in
+++ b/sci-libs/acml/files/lapack.pc.in
@@ -7,5 +7,5 @@ Name: lapack
 Description: ACML implementation of the F77 Linear Algebra PACKage
 Version: @PV@
 URL: http://developer.amd.com/acml.jsp
-Libs: -L${libdir} -llapack -lacml_mv @EXTLIBS@
+Libs: -Wl,--no-as-needed -L${libdir} @ACMLLIBS@ @EXTLIBS@
 Cflags: @EXTFLAGS@