Cleaned-up linking and fixed tests thanks to Adam Piątyszek <ediap@et.put.poznan.pl>. Set consistency among eselect profiles.

Package-Manager: portage-2.1.3.12

6 files changed, 51 insertions, 33 deletions

diff --git a/sci-libs/mkl/ChangeLog b/sci-libs/mkl/ChangeLog
index fd28971b10d7..14dfbf98959a 100644
--- a/sci-libs/mkl/ChangeLog
+++ b/sci-libs/mkl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/mkl
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v 1.18 2007/10/15 16:07:05 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v 1.19 2007/10/17 15:06:32 bicatali Exp $
+
+  17 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org> files/blas.pc.in,
+  files/cblas.pc.in, files/lapack.pc.in, mkl-9.1.023.ebuild:
+  Cleaned-up linking and fixed tests thanks to Adam Piątyszek
+  <ediap@et.put.poznan.pl>. Set consistency among eselect profiles.
 
   15 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org> files/cblas.pc.in,
   mkl-9.1.023.ebuild:
diff --git a/sci-libs/mkl/Manifest b/sci-libs/mkl/Manifest
index 25922ecda2de..c0493f33c55c 100644
--- a/sci-libs/mkl/Manifest
+++ b/sci-libs/mkl/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX blas.pc.in 272 RMD160 6cda1e3b357cd20f9d11cace684eb052e7cb20e1 SHA1 5a93a650c3fe32adc8de432d94ea9037d3a97cea SHA256 21ae12b8f1ca4f01b7ce046276a0558ad03b79a6f511cbdd5e20f80530326160
-MD5 f37aa52613f32364296f5adef64029c5 files/blas.pc.in 272
-RMD160 6cda1e3b357cd20f9d11cace684eb052e7cb20e1 files/blas.pc.in 272
-SHA256 21ae12b8f1ca4f01b7ce046276a0558ad03b79a6f511cbdd5e20f80530326160 files/blas.pc.in 272
-AUX cblas.pc.in 292 RMD160 964cda46d4fbe9c7d25512c4e8b511904d098ae4 SHA1 3a846b1790291fa899e887bcafa311d8b24234bd SHA256 90af020bc4df33e8b7388c8efa7237285b62ea28d7aabd44adce0516f4761107
-MD5 599047f14061edb5375e0037ed07a0f8 files/cblas.pc.in 292
-RMD160 964cda46d4fbe9c7d25512c4e8b511904d098ae4 files/cblas.pc.in 292
-SHA256 90af020bc4df33e8b7388c8efa7237285b62ea28d7aabd44adce0516f4761107 files/cblas.pc.in 292
-AUX lapack.pc.in 281 RMD160 23f4f81bf84270e866c385e73dbf9688eec0e214 SHA1 355f71093f52ef471fdab028deea8273eeed8759 SHA256 da94506a04082c7f9897f341d72842317e466170ae7c33a2a40bc71d3602efbf
-MD5 0eaa741317e6d753a85efd9b65d46122 files/lapack.pc.in 281
-RMD160 23f4f81bf84270e866c385e73dbf9688eec0e214 files/lapack.pc.in 281
-SHA256 da94506a04082c7f9897f341d72842317e466170ae7c33a2a40bc71d3602efbf files/lapack.pc.in 281
+AUX blas.pc.in 301 RMD160 e49d662c1ab317bb331dd980bf6c1557322f3089 SHA1 e0ab6622fb2e73e6bb09d2e363c1b540921d2bfc SHA256 0e4113e2332e67f4966882da38f1e1f715fdb72d83ff15d4036aa68ead2ee422
+MD5 cec33c60e8679c8a7d8b24afd391fd25 files/blas.pc.in 301
+RMD160 e49d662c1ab317bb331dd980bf6c1557322f3089 files/blas.pc.in 301
+SHA256 0e4113e2332e67f4966882da38f1e1f715fdb72d83ff15d4036aa68ead2ee422 files/blas.pc.in 301
+AUX cblas.pc.in 321 RMD160 27f184b531e41d78ebe7966486ebce3f4da75344 SHA1 f3c05f83ed43cced555b0ccb862f07a42a96accd SHA256 59ad87e793688cd414ba505610b1292bb74a8779c2e1ef421339eaec288f8970
+MD5 853b72a8f690b31e6fa076ae42d64fe9 files/cblas.pc.in 321
+RMD160 27f184b531e41d78ebe7966486ebce3f4da75344 files/cblas.pc.in 321
+SHA256 59ad87e793688cd414ba505610b1292bb74a8779c2e1ef421339eaec288f8970 files/cblas.pc.in 321
+AUX lapack.pc.in 310 RMD160 b389eebc0b4d71133736a2717d9ae1bf3d1e11b6 SHA1 bd68f6d050bd5719b116b0149b4785de5134a6c9 SHA256 495f16a2fe8f2087747ec45762fc7954046aaca77b8cb0e4caec0e07f299e352
+MD5 0dd4360e1468c6ea630b5addf9f884d0 files/lapack.pc.in 310
+RMD160 b389eebc0b4d71133736a2717d9ae1bf3d1e11b6 files/lapack.pc.in 310
+SHA256 495f16a2fe8f2087747ec45762fc7954046aaca77b8cb0e4caec0e07f299e352 files/lapack.pc.in 310
 DIST l_mkl_enh_p_9.1.023.tgz 316915220 RMD160 afdcb8ef28053e9ee5b1a3f8b9e6126c58b94f4b SHA1 9b03333627ab69cf9139838444e6e43d0b7404c8 SHA256 609ba57261b4959dfc8e6e56959f93ff7dba7b568ca5c80e09f4013df0207106
 DIST l_mkl_p_9.1.023.tgz 155907883 RMD160 f5d34a170c77fe9929daf6a83bade6d845ada2ad SHA1 52693b9aca15d43a890af92e0686b651834baace SHA256 7315e35a48b8cbe5af4cdcd24b2ccbd3971048b40e965ccaf9b4d655d98bdecd
-EBUILD mkl-9.1.023.ebuild 8523 RMD160 5111c7c054afffb96b1a72a4955612d47acb7c43 SHA1 ba645ed052580378444d30ff1dc9d1302a09d1f5 SHA256 3e3728f0aae5e88349c587b4fd27b3897467a25e00af08541f0e5d04c50156fd
-MD5 ea594a3b958f5380c149691f0cae2281 mkl-9.1.023.ebuild 8523
-RMD160 5111c7c054afffb96b1a72a4955612d47acb7c43 mkl-9.1.023.ebuild 8523
-SHA256 3e3728f0aae5e88349c587b4fd27b3897467a25e00af08541f0e5d04c50156fd mkl-9.1.023.ebuild 8523
-MISC ChangeLog 4380 RMD160 6eca481f55b93adb6784dcf35cf9803c33f9a66b SHA1 f9dc0bf650688fb854ea17302916464ee71aba7d SHA256 eb824698a204ce7ec4adf4ca2bedf7bdbbc0c9f2c6aff17fd1b68ca52b411a70
-MD5 545b1e971ad3ffbb9c7fa5f803959284 ChangeLog 4380
-RMD160 6eca481f55b93adb6784dcf35cf9803c33f9a66b ChangeLog 4380
-SHA256 eb824698a204ce7ec4adf4ca2bedf7bdbbc0c9f2c6aff17fd1b68ca52b411a70 ChangeLog 4380
+EBUILD mkl-9.1.023.ebuild 8900 RMD160 5fbdd71f8be7b0a817630b7bb5755cd742d250ca SHA1 37004d97f4b6063308987e5bbd795a07c03338b3 SHA256 5405fcf452dc0e11ba27d3882e3d0a19d71c10254c0c144add2ec5b2cdf2a075
+MD5 db847f461585f47ebf1477f89ba86088 mkl-9.1.023.ebuild 8900
+RMD160 5fbdd71f8be7b0a817630b7bb5755cd742d250ca mkl-9.1.023.ebuild 8900
+SHA256 5405fcf452dc0e11ba27d3882e3d0a19d71c10254c0c144add2ec5b2cdf2a075 mkl-9.1.023.ebuild 8900
+MISC ChangeLog 4646 RMD160 89135ccd8124dc0ce2a786a093dbda06bbfef746 SHA1 7ae40bce0f5f94750dd1c4bb6914fabb6b7db545 SHA256 f9af769920a496aa8ba3f57adca2fb813f7ce9b2e278afa5d71a6718622057cd
+MD5 326aa0040ec5821c9196e9f4ef6b1a9f ChangeLog 4646
+RMD160 89135ccd8124dc0ce2a786a093dbda06bbfef746 ChangeLog 4646
+SHA256 f9af769920a496aa8ba3f57adca2fb813f7ce9b2e278afa5d71a6718622057cd ChangeLog 4646
 MISC metadata.xml 605 RMD160 a48ecbc106b8037bc5ea0c075d0b1efe1c9532b2 SHA1 ca9d24da338e47cbeceec284d724405291d4d29a SHA256 449f256f34be916da81300d86c5c224fd01aeb378d35c10274de9b42e61896da
 MD5 baff61776b3939e7c0f39aca5cb99378 metadata.xml 605
 RMD160 a48ecbc106b8037bc5ea0c075d0b1efe1c9532b2 metadata.xml 605
@@ -33,7 +33,7 @@ SHA256 4d6a55d472b164daba360ca503d9071907142bb6956d5d396f235ec38df5225d files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHE5BA1ycZbhPLE2ARAuddAKCVOFn6JtV/LMpUVfmAtP5YEg7mLgCgoXpx
-g3yQvK1dbxrXcaMUGrVKZs8=
-=DfMQ
+iD8DBQFHFiUQ1ycZbhPLE2ARAvYFAJ9pZRgUTmnWz3b0dVywCg9UhGZzGACfa68c
+bdxfE7SNwg05Tq+6+S0pXWE=
+=egd0
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/mkl/files/blas.pc.in b/sci-libs/mkl/files/blas.pc.in
index b9bd2e3b3c1c..7ab8307605db 100644
--- a/sci-libs/mkl/files/blas.pc.in
+++ b/sci-libs/mkl/files/blas.pc.in
@@ -7,4 +7,5 @@ Name: blas
 Description: MKL implementations of the F77 Basic Linear Algebra Subroutines
 Version: @PV@
 URL: http://developer.intel.com/software/products/mkl/
-Libs: -L${libdir} -lblas @EXTLIBS@
+Libs: @GFORTRANLIBS@ -L${libdir} -lblas
+Libs.private: @EXTLIBS@
diff --git a/sci-libs/mkl/files/cblas.pc.in b/sci-libs/mkl/files/cblas.pc.in
index 572ea1177f47..bbf4af767406 100644
--- a/sci-libs/mkl/files/cblas.pc.in
+++ b/sci-libs/mkl/files/cblas.pc.in
@@ -7,5 +7,6 @@ Name: cblas
 Description: MKL implementations of the C Basic Linear Algebra Subroutines
 Version: @PV@
 URL: http://developer.intel.com/software/products/mkl/
-Libs: -L${libdir} -lcblas @EXTLIBS@
+Libs: @GFORTRANLIBS@ -L${libdir} -lcblas
+Libs.private: @EXTLIBS@
 Cflags: -I${includedir}
diff --git a/sci-libs/mkl/files/lapack.pc.in b/sci-libs/mkl/files/lapack.pc.in
index 6c1e31640a76..4e217574fa0d 100644
--- a/sci-libs/mkl/files/lapack.pc.in
+++ b/sci-libs/mkl/files/lapack.pc.in
@@ -8,4 +8,5 @@ Description: MKL implementations of the F77 Linear Algebra PACKage
 Version: @PV@
 URL: http://developer.intel.com/software/products/mkl/
 Requires: blas
-Libs: -L${libdir} -llapack @EXTLIBS@
+Libs: @GFORTRANLIBS@ -L${libdir} -llapack
+Libs.private: @EXTLIBS@
diff --git a/sci-libs/mkl/mkl-9.1.023.ebuild b/sci-libs/mkl/mkl-9.1.023.ebuild
index 6ed59bea558e..7b2a015d4959 100644
--- a/sci-libs/mkl/mkl-9.1.023.ebuild
+++ b/sci-libs/mkl/mkl-9.1.023.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild,v 1.3 2007/10/15 16:07:05 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild,v 1.4 2007/10/17 15:06:32 bicatali Exp $
 
 inherit eutils versionator toolchain-funcs fortran
 
@@ -162,7 +162,7 @@ src_compile() {
 			einfo "Compiling fftw static lib wrappers for ${p}"
 			for x in "${S}"/interfaces/fft*; do
 				cd "${x}"
-				emake \
+				emake -j1 \
 					F=${MKL_CC} \
 					MKL_SUBVERS=${p} \
 					lib${MKL_ARCH} \
@@ -175,8 +175,8 @@ src_compile() {
 src_test() {
 	local usegnu
 	[[ ${FORTRANC} = g* ]] && usegnu=gnu
-	# restrict tests for blas and lapack for now.
-	# testing fftw requires checking many C and fortran compilers
+	# restrict tests for blas and cblas for now.
+	# for t in blas cblas fft*; do
 	for t in blas lapack; do
 		cd "${S}"/tests/${t}
 		for p in ${MKL_PROF}; do
@@ -202,7 +202,7 @@ mkl_install_lib() {
 	[[ "${1}" == "serial" ]] && extlibs=""
 
 	[[ "${FORTRANC}" == "gfortran" ]] && \
-		extlibs="${extlibs} -L${libdir} -lmkl_gfortran"
+		gfortranlibs="-L${libdir} -lmkl_gfortran"
 
 	cp -pPR "${S}"/${proflib} "${D}"${MKL_DIR}
 
@@ -221,6 +221,7 @@ EOF
 			-e "s:@INCDIR@:${MKL_DIR}/include:" \
 			-e "s:@PV@:${PV}:" \
 			-e "s:@EXTLIBS@:${extlibs}:g" \
+			-e "s:@GFORTRANLIBS@:${gfortranlibs}:g" \
 			"${FILESDIR}"/${x}.pc.in > ${x}.pc || die "sed ${x}.pc failed"
 		insinto ${libdir}
 		doins ${x}.pc
@@ -235,6 +236,7 @@ EOF
 	sed -e "s:@LIBDIR@:$(get_libdir):" \
 		-e "s:@PV@:${PV}:" \
 		-e "s:@EXTLIBS@:${extlibs}:g" \
+		-e "s:@GFORTRANLIBS@:${gfortranlibs}:g" \
 		"${FILESDIR}"/lapack.pc.in > lapack.pc || die "sed lapack.pc failed"
 	insinto ${libdir}
 	doins lapack.pc
@@ -290,14 +292,22 @@ pkg_postinst() {
 		ext=serial
 	fi
 	ESELECT_PROF="${PN}-${FORTRANC}-${ext}"
+	# if blas profile is mkl, set lapack and cblas profiles as mkl
+	local blas_lib=$(eselect blas show | cut -d' ' -f2)
 	for p in blas cblas lapack; do
 		local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-		if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
+		if [[ -z ${current_lib} || \
+			${current_lib} == ${ESELECT_PROF} || \
+			${blas_lib} == ${ESELECT_PROF} ]]; then
 			# work around eselect bug #189942
 			local configfile="${ROOT}"/etc/env.d/${p}/$(get_libdir)/config
 			[[ -e ${configfile} ]] && rm -f ${configfile}
 			eselect ${p} set ${ESELECT_PROF}
 			elog "${p} has been eselected to ${ESELECT_PROF}"
+			if [[ ${current_lib} != ${blas_lib} ]]; then
+				eselect blas set ${ESELECT_PROF}
+				elog "${p} has been eselected to ${ESELECT_PROF} for consistency"
+			fi
 		else
 			elog "Current eselected ${p} is ${current_lib}"
 			elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"