Added a symlink for cblas.h, pkg-config options for include directories, and removed rpm cruft from unpacking.

Package-Manager: portage-2.1.4.4

3 files changed, 346 insertions, 5 deletions

diff --git a/sci-libs/mkl/ChangeLog b/sci-libs/mkl/ChangeLog
index c6aa04079d56..6dd3e11876a2 100644
--- a/sci-libs/mkl/ChangeLog
+++ b/sci-libs/mkl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/mkl
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v 1.29 2008/05/29 09:44:11 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v 1.30 2008/06/23 08:51:56 bicatali Exp $
+
+*mkl-10.0.3.020-r1 (23 Jun 2008)
+
+  23 Jun 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +mkl-10.0.3.020-r1.ebuild:
+  Added a symlink for cblas.h, pkg-config options for include directories,
+  and removed rpm cruft from unpacking.
 
   29 May 2008; Sébastien Fabbro <bicatali@gentoo.org>
   mkl-10.0.3.020.ebuild:
diff --git a/sci-libs/mkl/Manifest b/sci-libs/mkl/Manifest
index b1bfb0ec2615..a40f05882a1d 100644
--- a/sci-libs/mkl/Manifest
+++ b/sci-libs/mkl/Manifest
@@ -11,14 +11,15 @@ DIST l_mkl_p_10.0.2.018.tgz 227440983 RMD160 0c28416597ef917328193fa0c6403d7c0e7
 DIST l_mkl_p_10.0.3.020.tgz 229735507 RMD160 305b6e5ad2e85434ffc1ad6c317bf20aca4d6a44 SHA1 9e2eba991ad74c336002a27e85b5ec17611ae02b SHA256 5d2ec881db3fd33e6ada301a7a13b435be23aa5b0a81858d9c143207411fe17c
 DIST l_mkl_p_9.1.023.tgz 155907883 RMD160 f5d34a170c77fe9929daf6a83bade6d845ada2ad SHA1 52693b9aca15d43a890af92e0686b651834baace SHA256 7315e35a48b8cbe5af4cdcd24b2ccbd3971048b40e965ccaf9b4d655d98bdecd
 EBUILD mkl-10.0.2.018.ebuild 9103 RMD160 f3e661aa3041a1dbbaf50614365544a0b18a452b SHA1 7bd3ef5620825830439a2b5d43d2112d8570b8e7 SHA256 7c4c4671fd24bf14f32814ca66e3c23279b780d491755c776f41b921e7ff3b46
+EBUILD mkl-10.0.3.020-r1.ebuild 9332 RMD160 1178e3a16490472efda568cc4f957956e6036b18 SHA1 9638a92f2793ffb00bccd65050d88c1bec8230ed SHA256 e2830b2d1d6a84a593bf75a589aa3afc17b1c9c48e8329eb3c031a59635bc8db
 EBUILD mkl-10.0.3.020.ebuild 9170 RMD160 8ecf6f32a5a8f38bad0dc8230bf1a8000a06cade SHA1 6bf63bc2667cd470b4b87810e6f9535cda19bd7e SHA256 5ec7dfc3daa44a244454921feb6e8c5bec7736d5464b2db2bb2b66678edf5595
 EBUILD mkl-9.1.023.ebuild 8872 RMD160 3539b73652a2e379eef8efe63a0b64268fcc5b20 SHA1 57325ba951894aa29062430afa615e19aa541c4c SHA256 b4f582c99b7cda4e26b329a19a9300416c3fc2a5295dde3c22233aff6732857b
-MISC ChangeLog 6350 RMD160 7181b7bd8985c4fb5291b9b167f2ace1b3bca3b6 SHA1 8886fecf4232b8e94a877e5165a6c73484edfea5 SHA256 3db1ad2211ae1b4c255818a1351f401257d512a7357652991ec43b27843a664f
+MISC ChangeLog 6584 RMD160 5f0c6cec3cdfa923bf9f65214667feebcce86c2f SHA1 29445383af719b1c1229adc72b64bcae5a217493 SHA256 861e125a76c5f91e101ae2787475d38c738acd745d681ccbdd07baeb4d48149b
 MISC metadata.xml 605 RMD160 a48ecbc106b8037bc5ea0c075d0b1efe1c9532b2 SHA1 ca9d24da338e47cbeceec284d724405291d4d29a SHA256 449f256f34be916da81300d86c5c224fd01aeb378d35c10274de9b42e61896da
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkg+fHEACgkQ1ycZbhPLE2DS5gCdGgH1gcqsON1xIRdm8vPlTciv
-24EAn30wL9GMuhiyZw6lImo8Dzv6Lsp9
-=SzBu
+iEYEARECAAYFAkhfZDwACgkQ1ycZbhPLE2AzZACfZbj6glc3lLkXz2+sLYGLlGj8
+lLYAn1Gv/hFmcX2qCdKuDfAcxckvI9mJ
+=KIC1
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/mkl/mkl-10.0.3.020-r1.ebuild b/sci-libs/mkl/mkl-10.0.3.020-r1.ebuild
new file mode 100644
index 000000000000..47bd3f854b46
--- /dev/null
+++ b/sci-libs/mkl/mkl-10.0.3.020-r1.ebuild
@@ -0,0 +1,333 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-10.0.3.020-r1.ebuild,v 1.1 2008/06/23 08:51:56 bicatali Exp $
+
+inherit eutils toolchain-funcs fortran check-reqs
+
+PID=1088
+PB=${PN}
+DESCRIPTION="Intel(R) Math Kernel Library: linear algebra, fft, math functions"
+HOMEPAGE="http://developer.intel.com/software/products/mkl/"
+
+KEYWORDS="~amd64 ~ia64 ~x86"
+SRC_URI="http://registrationcenter-download.intel.com/irc_nas/${PID}/l_${PN}_p_${PV}.tgz"
+
+#slotting not yet supported (need eselect-mkl)
+#MAJOR=$(get_major_version ${PV})
+#MINOR=$(get_version_component_range 2 ${PV})
+#SLOT="${MAJOR}.${MINOR}"
+
+SLOT="0"
+LICENSE="Intel-SDP"
+
+IUSE="doc fftw fortran95 int64 mpi"
+RESTRICT="strip mirror"
+
+DEPEND="app-admin/eselect-blas
+	app-admin/eselect-cblas
+	app-admin/eselect-lapack"
+
+RDEPEND="${DEPEND}
+	doc? ( app-doc/blas-docs app-doc/lapack-docs )
+	mpi? ( virtual/mpi )"
+
+MKL_DIR=/opt/intel/${PN}/${PV}
+INTEL_LIC_DIR=/opt/intel/licenses
+
+pkg_setup() {
+	# Check the license
+	if [[ -z ${MKL_LICENSE} ]]; then
+		MKL_LICENSE="$(grep -ls MKern ${ROOT}${INTEL_LIC_DIR}/* | tail -n 1)"
+		MKL_LICENSE=${MKL_LICENSE/${ROOT}/}
+	fi
+	if  [[ -z ${MKL_LICENSE} ]]; then
+		eerror "Did not find any valid mkl license."
+		eerror "Register at ${HOMEPAGE} to receive a license"
+		eerror "and place it in ${INTEL_LIC_DIR} or run:"
+		eerror "export MKL_LICENSE=/my/license/file emerge mkl"
+		die "license setup failed"
+	fi
+
+	# Check if we have enough free diskspace to install
+	CHECKREQS_DISK_BUILD="1100"
+	check_reqs
+
+	# Check and setup fortran
+	FORTRAN="gfortran ifc g77"
+	use int64 && FORTRAN="gfortran ifc"
+	if use fortran95; then
+		FORTRAN="gfortran ifc"
+		# blas95 and lapack95 don't compile with gfortran < 4.2
+		[[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] && FORTRAN="ifc"
+	fi
+	fortran_pkg_setup
+	MKL_FC="gnu"
+	[[ ${FORTRANC} == if* ]] && MKL_FC="intel"
+
+	# build profiles according to what compiler is installed
+	MKL_CC="gnu"
+	[[ $(tc-getCC) == icc ]] && MKL_CC="intel"
+
+	if has_version sys-cluster/mpich; then
+		MKL_MPI=mpich
+	elif has_version sys-cluster/mpich2; then
+		MKL_MPI=mpich2
+	elif has_version sys-cluster/openmpi; then
+		MKL_MPI=openmpi
+	elif has_version sys-cluster/lam-mpi; then
+		MKL_MPI=lam-mpi
+	else
+		MKL_MPI=intelmpi
+	fi
+}
+
+src_unpack() {
+
+	unpack ${A}
+	cd l_${PN}_*_${PV}/install
+
+	cp ${MKL_LICENSE} "${WORKDIR}"/
+	MKL_LIC="$(basename ${MKL_LICENSE})"
+
+	# binary blob extractor installs rpm leftovers in /opt/intel
+	addwrite /opt/intel
+	# undocumented features: INSTALLMODE_mkl=NONRPM
+
+	# We need to install mkl non-interactively.
+	# If things change between versions, first do it interactively:
+	# tar xf l_*; ./install.sh --duplicate mkl.ini;
+	# The file will be instman/mkl.ini
+	# Then check it and modify the ebuild-created one below
+	# --norpm is required to be able to install 10.x
+	cat > mkl.ini <<-EOF
+		[MKL]
+		EULA_ACCEPT_REJECT=ACCEPT
+		FLEXLM_LICENSE_LOCATION=${WORKDIR}/${MKL_LIC}
+		INSTALLMODE_mkl=NONRPM
+		INSTALL_DESTINATION=${S}
+	EOF
+	einfo "Extracting ..."
+	./install \
+		--silent ./mkl.ini \
+		--installpath "${S}" \
+		--log log.txt &> /dev/null
+
+	if [[ -z $(find "${S}" -name libmkl.so) ]]; then
+		eerror "Could not find extracted files"
+		eerror "See ${PWD}/log.txt to see why"
+		die "extracting failed"
+	fi
+	# remove left over
+	rm -f /opt/intel/.*mkl*.log /opt/intel/intel_sdp_products.db
+
+	# remove unused stuff and set up intel names
+	rm -rf "${WORKDIR}"/l_*
+
+	cd "${S}"
+	# allow openmpi to work
+	epatch "${FILESDIR}"/${PN}-10.0.2.018-openmpi.patch
+	# make scalapack tests work for gfortran
+	epatch "${FILESDIR}"/${PN}-10.0.2.018-tests.patch
+	case ${ARCH} in
+		x86)	MKL_ARCH=32
+				MKL_KERN=ia32
+				rm -rf lib*/{em64t,64}
+				;;
+
+		amd64)	MKL_ARCH=em64t
+				MKL_KERN=em64t
+				rm -rf lib*/{32,64}
+				;;
+
+		ia64)	MKL_ARCH=64
+				MKL_KERN=ipf
+				rm -rf lib*/{32,em64t}
+				;;
+	esac
+	MKL_LIBDIR=${MKL_DIR}/lib/${MKL_ARCH}
+}
+
+src_compile() {
+	cd "${S}"/interfaces
+	if use fortran95; then
+		einfo "Compiling fortan95 static lib wrappers"
+		local myconf="lib${MKL_ARCH}"
+		[[ ${FORTRANC} == gfortran ]] && \
+			myconf="${myconf} FC=gfortran"
+		if use int64; then
+			myconf="${myconf} interface=ilp64"
+			[[ ${FORTRANC} == gfortran ]] && \
+				myconf="${myconf} FOPTS=-fdefault-integer-8"
+		fi
+		for x in blas95 lapack95; do
+			pushd ${x}
+			emake ${myconf} || die "emake ${x} failed"
+			popd
+		done
+	fi
+
+	if use fftw; then
+		local fftwdirs="fftw2xc fftw2xf fftw3xc fftw3xf"
+		local myconf="lib${MKL_ARCH} compiler=${MKL_CC}"
+		if use mpi; then
+			fftwdirs="${fftwdirs} fftw2x_cdft"
+			myconf="${myconf} mpi=${MKL_MPI}"
+		fi
+		einfo "Compiling fftw static lib wrappers"
+		for x in ${fftwdirs}; do
+			pushd ${x}
+			emake ${myconf} || die "emake ${x} failed"
+			popd
+		done
+	fi
+}
+
+src_test() {
+	cd "${S}"/tests
+	local myconf
+	local testdirs="blas cblas"
+	use int64 && myconf="${myconf} interface=ilp64"
+	if use mpi; then
+		testdirs="${testdirs} scalapack"
+		myconf="${myconf} mpi=${MKL_MPI}"
+	fi
+	for x in ${testdirs}; do
+		pushd ${x}
+		einfo "Testing ${x}"
+		emake \
+			compiler=${MKL_FC} \
+			${myconf} \
+			so${MKL_ARCH} \
+			|| die "emake ${x} failed"
+		popd
+	done
+}
+
+mkl_make_generic_profile() {
+	cd "${S}"
+	# produce eselect files
+	# don't make them in FILESDIR, it changes every major version
+	cat  > eselect.blas <<-EOF
+		${MKL_LIBDIR}/libmkl_${MKL_KERN}.a /usr/@LIBDIR@/libblas.a
+		${MKL_LIBDIR}/libmkl.so /usr/@LIBDIR@/libblas.so
+		${MKL_LIBDIR}/libmkl.so /usr/@LIBDIR@/libblas.so.0
+	EOF
+	cat  > eselect.cblas <<-EOF
+		${MKL_LIBDIR}/libmkl_${MKL_KERN}.a /usr/@LIBDIR@/libcblas.a
+		${MKL_LIBDIR}/libmkl.so /usr/@LIBDIR@/libcblas.so
+		${MKL_LIBDIR}/libmkl.so /usr/@LIBDIR@/libcblas.so.0
+		${MKL_DIR}/include/mkl_cblas.h /usr/include/cblas.h
+	EOF
+	cat > eselect.lapack <<-EOF
+		${MKL_LIBDIR}/libmkl_lapack.a /usr/@LIBDIR@/liblapack.a
+		${MKL_LIBDIR}/libmkl_lapack.so /usr/@LIBDIR@/liblapack.so
+		${MKL_LIBDIR}/libmkl_lapack.so /usr/@LIBDIR@/liblapack.so.0
+	EOF
+}
+
+# usage: mkl_add_profile <profile> <interface_lib> <thread_lib> <rtl_lib>
+mkl_add_profile() {
+	cd "${S}"
+	local prof=${1}
+	insinto ${MKL_LIBDIR}
+	for x in blas cblas lapack; do
+		cat > ${x}-${prof}.pc <<-EOF
+			prefix=/usr
+			libdir=${MKL_LIBDIR}
+			includedir=${MKL_DIR}/include
+			Name: ${x}
+			Description: Intel(R) Math Kernel Library implementation of ${p}
+			Version: ${PV}
+			URL: ${HOMEPAGE}
+			Libs: -Wl,--no-as-needed -L\${libdir} ${2} ${3} -lmkl_core ${4} -lpthread
+			Cflags: -I${includedir}
+		EOF
+		cp eselect.${x} eselect.${x}.${prof}
+		echo "${MKL_LIBDIR}/${x}-${prof}.pc /usr/@LIBDIR@/pkgconfig/${x}.pc" \
+			>> eselect.${x}.${prof}
+		doins ${x}-${prof}.pc
+		eselect ${x} add $(get_libdir) eselect.${x}.${prof} ${prof}
+	done
+}
+
+mkl_make_profiles() {
+	local clib
+	has_version 'dev-lang/ifc' && clib="intel"
+	built_with_use sys-devel/gcc fortran && clib="${clib} gf"
+	local slib="-lmkl_sequential"
+	local rlib="-liomp5"
+	for c in ${clib}; do
+		local ilib="-lmkl_${c}_lp64"
+		use x86 && ilib="-lmkl_${c}"
+		local tlib="-lmkl_${c/gf/gnu}_thread"
+		local comp="${c/gf/gfortran}"
+		comp="${comp/intel/ifort}"
+		mkl_add_profile mkl-${comp} ${ilib} ${slib}
+		mkl_add_profile mkl-${comp}-threads ${ilib} ${tlib} ${rlib}
+		if use int64; then
+			ilib="-lmkl_${c}_ilp64"
+			mkl_add_profile mkl-${comp}-int64 ${ilib} ${slib}
+			mkl_add_profile mkl-${comp}-threads-int64 ${ilib} ${tlib} ${rlib}
+		fi
+	done
+}
+
+src_install() {
+	dodir ${MKL_DIR}
+	# upstream installs a link, no idea why
+	dosym ${MKL_DIR} ${MKL_DIR/mkl/cmkl}
+
+	# install license
+	if  [[ ! -f ${INTEL_LIC_DIR}/${MKL_LIC} ]]; then
+		insinto ${INTEL_LIC_DIR}
+		doins "${WORKDIR}"/${MKL_LIC} || die "install license failed"
+	fi
+
+	# install main stuff: cp faster than doins
+	einfo "Installing files..."
+	local cpdirs="benchmarks doc examples include interfaces lib man tests"
+	local doinsdirs="tools"
+	cp -pPR ${cpdirs} "${D}"${MKL_DIR} \
+		|| die "installing mkl failed"
+	insinto ${MKL_DIR}
+	doins -r ${doinsdirs} || die "doins ${doinsdirs} failed"
+	dosym mkl_cblas.h ${MKL_DIR}/include/mkl_cblas.h
+
+	# install blas/lapack profiles
+	mkl_make_generic_profile
+	mkl_make_profiles
+
+	# install env variables
+	local env_file=35mkl
+	echo "LDPATH=${MKL_LIBDIR}" > ${env_file}
+	echo "MANPATH=${MKL_DIR}/man" >> ${env_file}
+	doenvd ${env_file} || die "doenvd failed"
+}
+
+pkg_postinst() {
+	# if blas profile is mkl, set lapack and cblas profiles as mkl
+	local blas_lib=$(eselect blas show | cut -d' ' -f2)
+	local def_prof="mkl-gfortran-threads"
+	has_version 'dev-lang/ifc' && def_prof="mkl-ifort-threads"
+	use int64 && def_prof="${def_prof}-int64"
+	for x in blas cblas lapack; do
+		local current_lib=$(eselect ${x} show | cut -d' ' -f2)
+		if [[ -z ${current_lib} || \
+			${current_lib} == mkl* || \
+			${blas_lib} == mkl* ]]; then
+			# work around eselect bug #189942
+			local configfile="${ROOT}"/etc/env.d/${x}/$(get_libdir)/config
+			[[ -e ${configfile} ]] && rm -f ${configfile}
+			eselect ${x} set ${def_prof}
+			elog "${x} has been eselected to ${def_prof}"
+			if [[ ${current_lib} != ${blas_lib} ]]; then
+				eselect blas set ${def_prof}
+				elog "${x} is now set to ${def_prof} for consistency"
+			fi
+		else
+			elog "Current eselected ${x} is ${current_lib}"
+			elog "To use one of mkl profiles, issue (as root):"
+			elog "\t eselect ${x} set <profile>"
+		fi
+	done
+}