[gentoo-commits] gentoo-x86 commit in sci-libs/mkl: mkl-9.1.023.ebuild ChangeLog

["Sebastien Fabbro (bicatali)" <bicatali@gentoo.org>]

bicatali    07/10/17 15:06:32

  Modified:             mkl-9.1.023.ebuild ChangeLog
  Log:
  Cleaned-up linking and fixed tests thanks to Adam Piątyszek <ediap@et.put.poznan.pl>. Set consistency among eselect profiles.
  (Portage version: 2.1.3.12)

Revision  Changes    Path
1.4                  sci-libs/mkl/mkl-9.1.023.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild?r1=1.3&r2=1.4

Index: mkl-9.1.023.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mkl-9.1.023.ebuild	15 Oct 2007 16:07:05 -0000	1.3
+++ mkl-9.1.023.ebuild	17 Oct 2007 15:06:32 -0000	1.4
@@ -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 @@
 			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_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 @@
 	[[ "${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 @@
 			-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 @@
 	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 @@
 		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):"



1.19                 sci-libs/mkl/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/ChangeLog?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/ChangeLog?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/ChangeLog?r1=1.18&r2=1.19

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ChangeLog	15 Oct 2007 16:07:05 -0000	1.18
+++ ChangeLog	17 Oct 2007 15:06:32 -0000	1.19
@@ -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:



-- 
gentoo-commits@gentoo.org mailing list