[gentoo-commits] proj/sci:master commit in: sci-libs/plasma/

[Sebastien Fabbro]

commit:     cad4671a480d2cfdebbb33d9d5b6dc954506a195
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 29 00:04:49 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Nov 29 00:04:49 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=cad4671a

sci-libs/plasma: Version bump. Introduce testing

Package-Manager: portage-2.2.01.21313-prefix

---
 sci-libs/plasma/ChangeLog                          |    6 ++++
 .../{plasma-2.4.5.ebuild => plasma-2.4.6.ebuild}   |   31 +++++++++++++-------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/sci-libs/plasma/ChangeLog b/sci-libs/plasma/ChangeLog
index 38a82a6..b0003dc 100644
--- a/sci-libs/plasma/ChangeLog
+++ b/sci-libs/plasma/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*plasma-2.4.6 (29 Nov 2012)
+
+  29 Nov 2012; Sébastien Fabbro <bicatali@g.o> +plasma-2.4.6.ebuild,
+  -plasma-2.4.5.ebuild:
+  sci-libs/plasma: Version bump. Introduce testing
+
   12 Jul 2012; Sébastien Fabbro <bicatali@g.o> plasma-2.4.5.ebuild:
   sci-libs/plasma: Shared library fixes and prefix love
 

diff --git a/sci-libs/plasma/plasma-2.4.5.ebuild b/sci-libs/plasma/plasma-2.4.6.ebuild
similarity index 78%
rename from sci-libs/plasma/plasma-2.4.5.ebuild
rename to sci-libs/plasma/plasma-2.4.6.ebuild
index c5b2181..e3bd016 100644
--- a/sci-libs/plasma/plasma-2.4.5.ebuild
+++ b/sci-libs/plasma/plasma-2.4.6.ebuild
@@ -14,20 +14,23 @@ SRC_URI="http://icl.cs.utk.edu/projectsfiles/plasma/pubs/${MYP}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples fortran static-libs"
+IUSE="doc examples fortran static-libs test"
 
-RDEPEND="sys-apps/hwloc
+RDEPEND="
+	sys-apps/hwloc
 	virtual/blas
 	virtual/cblas
-	virtual/fortran
 	virtual/lapack
 	virtual/lapacke"
-
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	test? ( sci-libs/lapacke-reference[tmg] )"
 
 S="${WORKDIR}/${MYP}"
 
+# TODO: virtual/{blas,cblas,lapack} serial and threaded. plasma works properly
+# with serial blas/lapack (see README). not doable dynamically with atlas
+
 static_to_shared() {
 	local libstatic=${1}; shift
 	local libname=$(basename ${libstatic%.a})
@@ -78,18 +81,18 @@ src_configure() {
 		CFLAGS = ${CFLAGS} -DADD_ -fPIC
 		FFLAGS = ${FFLAGS} -fPIC
 		LOADER = $(tc-getFC)
-		LIBBLAS = $(pkg-config --libs blas)
-		LIBCBLAS = $(pkg-config --libs cblas)
-		LIBLAPACK = $(pkg-config --libs lapack)
-		LIBCLAPACK = $(pkg-config --libs lapacke)
+		LIBBLAS = $($(tc-getPKG_CONFIG) --libs blas)
+		LIBCBLAS = $($(tc-getPKG_CONFIG) --libs cblas)
+		LIBLAPACK = $($(tc-getPKG_CONFIG) --libs lapack)
+		LIBCLAPACK = $($(tc-getPKG_CONFIG) --libs lapacke)
 		$(use fortran && echo "PLASMA_F90 = 1")
 	EOF
 }
 
 src_compile() {
 	emake lib
-	static_to_shared quark/libquark.a $(pkg-config --libs hwloc) -pthread
-	static_to_shared lib/libcoreblas.a quark/libquark.so $(pkg-config --libs cblas lapacke)
+	static_to_shared quark/libquark.a $($(tc-getPKG_CONFIG --libs hwloc)) -pthread
+	static_to_shared lib/libcoreblas.a quark/libquark.so $($(tc-getPKG_CONFIG --libs cblas lapacke))
 	static_to_shared lib/libplasma.a quark/libquark.so lib/libcoreblas.so
 	if use static-libs; then
 		emake cleanall
@@ -98,6 +101,12 @@ src_compile() {
 	fi
 }
 
+src_test() {
+	emake test
+	cd testing
+	LD_LIBRARY_PATH="../lib:../quark:${LD_LIBRARY_PATH}" ./plasma_testing.py || die
+}
+
 src_install() {
 	dolib.so lib/lib*$(get_libname)* quark/libquark$(get_libname)*
 	use static-libs && dolib.a lib/lib*.a quark/libquark.a