mkl-8.0.1.006.ebuild: make shared libs, removed cpu detection, threading by default

git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@101 32389bae-6d03-0410-99cf-db05cde120eb

2 files changed, 42 insertions, 75 deletions

diff --git a/sci-libs/mkl/Manifest b/sci-libs/mkl/Manifest
index 8c6f7a1f6..098fbeba5 100644
--- a/sci-libs/mkl/Manifest
+++ b/sci-libs/mkl/Manifest
@@ -1,12 +1,7 @@
 MD5 f0122114658bed82421c724016249798 ChangeLog 1771
 MD5 4a59bc353bb6c4711babda5f0a97f0db files/c-MKL.blas 472
-MD5 a3c0d02bf52b6977f4818e8524041737 files/c-MKL.lapack 506
-MD5 c8af4d9da9bc7da6fec9c7a463cf6bb7 files/c-threaded-MKL.blas 518
-MD5 302c9085e3b16c36b532e28765ab5acd files/c-threaded-MKL.lapack 552
 MD5 f1853cde0595400d25d2fa52f079a46e files/digest-mkl-8.0.1.006 68
 MD5 1504bdc6a8746339217cf1d2142f26bb files/f77-MKL.blas 440
 MD5 73b9deafc1ec5bb4398751c6875c911b files/f77-MKL.lapack 474
-MD5 12308b5448e67e8b264abf7539a97539 files/f77-threaded-MKL.blas 484
-MD5 c6dbd399b994048332e3bc58e4d449f6 files/f77-threaded-MKL.lapack 518
 MD5 729a826a74e62fe48daf668e3dccefb4 metadata.xml 603
-MD5 f38445162e380dfbaf86a019f73af186 mkl-8.0.1.006.ebuild 6060
+MD5 d3197e632d075080b717a8c509fd382e mkl-8.0.1.006.ebuild 5018
diff --git a/sci-libs/mkl/mkl-8.0.1.006.ebuild b/sci-libs/mkl/mkl-8.0.1.006.ebuild
index 78e218f8a..0fd6366e7 100644
--- a/sci-libs/mkl/mkl-8.0.1.006.ebuild
+++ b/sci-libs/mkl/mkl-8.0.1.006.ebuild
@@ -15,9 +15,9 @@ IUSE="fortran95 examples"
 SLOT="0"
 LICENSE="mkl-8.0.1"
 KEYWORDS="~x86 ~amd64 ~ia64"
-DEPEND="virtual/libc"
-RDEPEND="${DEPEND}
-    app-admin/eselect"
+DEPEND="virtual/libc
+	sci-libs/lapack-config
+	sci-libs/blas-config"
 
 PROVIDE="virtual/blas
 	     virtual/lapack"
@@ -110,29 +110,23 @@ src_compile() {
 		amd64)
 			IARCH="em64t"
 			IKERN="em64t"
-			ICPU="def"
-			(is-flag '-march=k8' || 
-				is-flag '-march=nocona' ) && ICPU="p4n"
 			;;
 		ia64)
 			IARCH="64"
 			IKERN="ipf"
-			ICPU="i2p"
 			;;
 		x86)
 			IARCH="32"
 			IKERN="ia32"
-			ICPU="def"
-			# could work out better cpu detection. now works for gcc-3.4 and icc
-			( is-flag '-march=pentium3' || \
-				is-flag '-march=pentiumiii') && ICPU="p3"
-			( is-flag '-march=pentium4' || \
-				is-flag '-msse2') && ICPU="p4"
-			is-flag '-msse3' && ICPU="p4e"
 			;;
 	esac
 	ILIBDIR=${INSTDIR}/lib/${IARCH}
-	einfo "IARCH=$IARCH IKERN=$IKERN ICPU=$ICPU"
+	einfo "IARCH=$IARCH IKERN=$IKERN"
+
+	for x in blas cblas lapack; do
+		cd ${S}/${INSTDIR}/tools/builder
+		make ${IKERN} export=${x}_list name=libmkl_${x}
+	done
 
 	if use fortran95; then
 		local fc=${FORTRANC}
@@ -147,7 +141,6 @@ src_compile() {
 				INSTALL_DIR=${S}/${ILIBDIR}
 		done
 	fi
-
 }
 
 src_test() {
@@ -167,72 +160,48 @@ src_test() {
 
 src_install () {
 	cd ${S}
-	# regular intel-style installation
+
+	# install license
 	if  [ -n "${INTEL_LICENSE}" ] && \
 		[ -f "${INTEL_LICENSE}" ]; then
 		insinto /opt/intel/licenses
 		doins ${INTEL_LICENSE}
 	fi
-	insinto /${INSTDIR}
-	doins -r ${INSTDIR}/{doc,include,tools}
-	use examples && doins -r ${INSTDIR}/examples
-	insinto /${ILIBDIR}
-	doins ${ILIBDIR}/*.a
-	insopts -m0755
-	doins ${ILIBDIR}/*.so
-	insopts -m0644
 
-	# gentoo-style installation
+	# install documentation and include files
+	insinto /${INSTDIR}
+	doins -r ${INSTDIR}/{doc,include}
 	dodir /usr/include
 	dosym /${INSTDIR}/include /usr/include/${PN}
+	use examples && doins -r ${INSTDIR}/examples
 
-	dodir /usr/$(get_libdir)/{blas,lapack}/{mkl,threaded-mkl}
-
-	# All install stuff below needs work using nasty libtool
-	# ---------------------------------------------------
+	# install static libraries
+	insinto /${ILIBDIR}
+	doins ${ILIBDIR}/*.a
+	dodir /usr/$(get_libdir)/{blas,lapack}/mkl
+	dosym /${ILIBDIR}/libmkl_${IKERN}.a \
+		/usr/$(get_libdir)/blas/mkl/libmkl_blas.a 
+	dosym /${ILIBDIR}/libmkl_lapack.a \
+		/usr/$(get_libdir)/lapack/mkl/libmkl_lapack.a 
 
+	# install shared libraries
 	insopts -m0755
-	gcc -fPIC -shared -L${S}/${ILIBDIR} -lmkl -lmkl_${ICPU} \
-		-o libmkl_blas.so
+	doins ${ILIBDIR}/*.so
 	insinto /usr/$(get_libdir)/blas/mkl
-	doins libmkl_blas.so
-
-	gcc -fPIC -shared -L${S}/${ILIBDIR} -lmkl_lapack32 -lmkl_lapack64 \
-		-o libmkl_lapack.so 
+	doins ${INSTDIR}/tools/builder/libmkl_{,c}blas.so
 	insinto /usr/$(get_libdir)/lapack/mkl
-	doins libmkl_lapack.so
-
-	gcc -fPIC -shared -L${S}/${ILIBDIR} -lmkl -lmkl_${ICPU} -lguide \
-		-o libmkl_blas.so
-	insinto /usr/$(get_libdir)/blas/threaded-mkl
-	doins libmkl_blas.so
-
-	gcc -fPIC -shared -L${S}/${ILIBDIR} -lmkl_lapack32 -lmkl_lapack64 -lguide \
-		-o libmkl_lapack.so
-	insinto /usr/$(get_libdir)/lapack/threaded-mkl
-	doins libmkl_lapack.so
-	
-	insopts -m0644
-	ar cr libmkl_blas.a ${ILIBDIR}/lib{mkl_${IKERN},guide}.a
-	ranlib libmkl_blas.a
-	insinto /usr/$(get_libdir)/blas/threaded-mkl
-	doins libmkl_blas.a
-
-	ar cr libmkl_lapack.a ${ILIBDIR}/lib{mkl_lapack,guide}.a
-	ranlib libmkl_lapack.a	
-	insinto /usr/$(get_libdir)/lapack/threaded-mkl
-	doins libmkl_lapack.a
-	# ---------------------------------------------------
+	doins ${INSTDIR}/tools/builder/libmkl_lapack.so
 
-	dosym /${ILIBDIR}/libmkl_${IKERN}.a \
-		/usr/$(get_libdir)/blas/mkl/libmkl_blas.a 
-	dosym /${ILIBDIR}/libmkl_lapack.a \
-		/usr/$(get_libdir)/lapack/mkl/libmkl_lapack.a 
+	# install tools
+	insopts -m0644
+	insinto /${INSTDIR}
+	rm -f ${INSTDIR}/tools/builder/*.so
+	doins -r ${INSTDIR}/tools
 
-	# install the required configuration scripts
+	# install required configuration scripts
 	for x in blas lapack; do
 		insinto /usr/$(get_libdir)/${x}		
-		for y in f77 f77-threaded c c-threaded; do
+		for y in f77 c; do
 			newins ${FILESDIR}/${y}-MKL.${x} ${y}-MKL
 		done
 	done
@@ -240,9 +209,12 @@ src_install () {
 
 pkg_postinst() {
 
+	${DESTTREE}/bin/blas-config MKL
+	${DESTTREE}/bin/lapack-config MKL
+
 	einfo
-	einfo "To use MKL's linear algebra, features, you have to issue (as root):"
-	einfo "\t eselect <impl> set MKL"
-	einfo "where <impl> is blas or lapack"
-	einfo
+	einfo "MKL ${PV} is not yet available for eselect"
+	einfo "Use blas-config and lapack-config to configure"
+	einfo "blas or lapack with MKL"
+	einfo 
 }