Remove buggy cilk from tests and cleanup shared library building

Package-Manager: portage-2.1.11.5/cvs/Linux x86_64

4 files changed, 60 insertions, 26 deletions

diff --git a/sci-libs/taucs/ChangeLog b/sci-libs/taucs/ChangeLog
index a46821b972e3..cc30dbeb9827 100644
--- a/sci-libs/taucs/ChangeLog
+++ b/sci-libs/taucs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/taucs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/taucs/ChangeLog,v 1.7 2012/05/04 08:22:53 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/taucs/ChangeLog,v 1.8 2012/07/06 19:01:37 bicatali Exp $
+
+  06 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/taucs-2.2-no-test-cilk.patch, taucs-2.2.ebuild:
+  Remove buggy cilk from tests and cleanup shared library building
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> taucs-2.2.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
@@ -25,4 +29,3 @@
   27 Oct 2008; Sébastien Fabbro <bicatali@gentoo.org> +metadata.xml,
   +taucs-2.2.ebuild:
   Initial import
-
diff --git a/sci-libs/taucs/Manifest b/sci-libs/taucs/Manifest
index 1dfae3bb8232..7f8d5eca0b7e 100644
--- a/sci-libs/taucs/Manifest
+++ b/sci-libs/taucs/Manifest
@@ -1,4 +1,15 @@
-DIST taucs-2.2.tgz 1573863 RMD160 e7621bc65af42432e708318e93bce8958bf3a482 SHA1 9f86bd091d42cad308b5137914fb7aa564bd0aae SHA256 fc13dae767db5e9035b1ce63036a16d3a260aad784f461e073f1150a078a77e4
-EBUILD taucs-2.2.ebuild 2387 RMD160 39b3e4c1c47319d5ef5866d0b4673f2c8f7fae4f SHA1 43cfb6a52d7a79b6eb04926349c89f696d9d4e08 SHA256 dd494811d1bb90d4f47069cfadec56b5cfffa11f094bae960869824a32ec001a
-MISC ChangeLog 999 RMD160 13ed5ef7e100e0add0797e4e8c4d424f57dbcf6c SHA1 a009d0e52f1e6d9a35f6c039c734cdc7d3d10cc8 SHA256 7d00e520a03eeaca01f9db7bb0796faea58b137902cf21f89a001e79172afcc8
-MISC metadata.xml 1069 RMD160 3fddea8b69ba933e95c64faa7696523613fc8dfb SHA1 1cc2037f46bab9ef2f9219145c0d4adce059aaf3 SHA256 34cc1bf9cbe2df01cb2f74681a4ac0e12291407db8f92f8f6e272557f06bbf69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX taucs-2.2-no-test-cilk.patch 816 SHA256 7803d2d35b4a4648c0b6856ada62175551c6db08fa3e7801565f887994cc6211 SHA512 04b580315d600eb68d908e10aaf5c600e03d7ec51437cf814dad6eed1eecd09e7b9c1d770e8c9c13e6ec268202c3335805dc32a68b9e5164cf038cd31acbcc95 WHIRLPOOL 5461d2b6e6dd39435541c8dfb2db633b9ba2d0301ce6626a203a02bb4a20dd606d8144548252627d5b87d1e60c34f56afd689dc8ed5f9ee66ba90f62ef82eabf
+DIST taucs-2.2.tgz 1573863 SHA256 fc13dae767db5e9035b1ce63036a16d3a260aad784f461e073f1150a078a77e4 SHA512 d8652de2da343dfd19c4278ac99313bcb577d976decdd3bd3875f0c9576832605b787feaef916eb4e82f22907c8bd029125c2ae56c827639e4d535ad62f20fcf WHIRLPOOL 6c789d98e0919a0e9fb4e7f002e16c8af8006ede9d25fc4a8416c5f7dd3f4bfcce7159edac6febba975d286c87d5564e551df9aa495ce253f450631210c499ab
+EBUILD taucs-2.2.ebuild 2399 SHA256 8dcd746df444d2e11d3bc2a55ba1f9b19bc7c27be064c778184f76ce738a7677 SHA512 828204a370b41ba8ef612ee54d700d1863bc58d15996419ac2146f30e6d651fdcb23d63e43c2f40651deba902e1414f2bf90763e9f00e0378258fdf9efd464e6 WHIRLPOOL 11f4c6c6f886b5abf7b13c10c6d01bb6ea84e50b90aebaa896bd2e6639fe43dc72367c4306ef2ea01d5e98b4923321891f714f1decbc4f81312e738a19453d81
+MISC ChangeLog 1180 SHA256 925d560a86ac6db8c88ea345d74b487b6531a5ae79fadd09fb724ad252d4a110 SHA512 420e8fd9ff950c80499c7695790dfd2da4c00c1dbd63faa838381ad55ded24369db990bda9d496f4ad9a071687c843610d0c825597e61f0c41b345f805249ac8 WHIRLPOOL ed2b73a8354f93ffffe004b93d5c5e78b83a1aa6ed7e1b134747b54c8b9cca7eb645cff15fba09930ea4b254a2424424f325a18a9bffd73e26bfdaa0ea673907
+MISC metadata.xml 1069 SHA256 34cc1bf9cbe2df01cb2f74681a4ac0e12291407db8f92f8f6e272557f06bbf69 SHA512 cda4cf3e49fd5beb9b5d5d4a000f92afd4bf1564607a3fd715c10150e1ea2cd6f02874b1850a65b836cb48915b3686b580d0dd938fea0cb95d056483777fc75b WHIRLPOOL 567752d2d85d463ce3e2b9c95fb9d80b18d473f3cacf0e1e93ac00926300f9db4782de3cfa7c614eca4b60c755280f230b5fd155cae7d42ea5fbb5f1f9a3b01a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEARECAAYFAk/3NhoACgkQ1ycZbhPLE2CVcgCeIFZshieZYCfF/NIA7Vdeuz7+
+H1EAoJoMWCvTIgr/Y63B46VqlsKTJ64Z
+=GwGT
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/taucs/files/taucs-2.2-no-test-cilk.patch b/sci-libs/taucs/files/taucs-2.2-no-test-cilk.patch
new file mode 100644
index 000000000000..68ecc3bf94b6
--- /dev/null
+++ b/sci-libs/taucs/files/taucs-2.2-no-test-cilk.patch
@@ -0,0 +1,20 @@
+--- testscript.orig	2012-07-06 19:42:51.000000000 +0100
++++ testscript	2012-07-06 19:43:17.000000000 +0100
+@@ -12,17 +12,6 @@
+ ulimit -s >> testscript.log
+ echo '==============' >> testscript.log
+ echo =============== >> testscript.log
+-echo = test_cilk_snmf = >> testscript.log
+-. ./configure in=progs/test_cilk_snmf.c $*
+-echo last conf is $TAUCS_LASTCONF >> testscript.log
+-make -f build/${TAUCS_LASTCONF}/makefile
+-if bin/${TAUCS_LASTCONF}/test_cilk_snmf >> testscript.log ; then
+-echo = TEST PASSED test_cilk_snmf >> testscript.log
+-else
+-echo = TEST FAILED test_cilk_snmf >> testscript.log
+-fi
+-echo =============== >> testscript.log
+-echo =============== >> testscript.log
+ echo = test_complex = >> testscript.log
+ . ./configure in=progs/test_complex.c $*
+ echo last conf is $TAUCS_LASTCONF >> testscript.log
diff --git a/sci-libs/taucs/taucs-2.2.ebuild b/sci-libs/taucs/taucs-2.2.ebuild
index d3571ba4c89b..24de0aab169b 100644
--- a/sci-libs/taucs/taucs-2.2.ebuild
+++ b/sci-libs/taucs/taucs-2.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/taucs/taucs-2.2.ebuild,v 1.7 2012/05/04 08:22:53 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/taucs/taucs-2.2.ebuild,v 1.8 2012/07/06 19:01:37 bicatali Exp $
 
 EAPI=4
 
-inherit eutils flag-o-matic fortran-2 toolchain-funcs
+inherit eutils fortran-2 toolchain-funcs
 
 DESCRIPTION="C library of sparse linear solvers"
 HOMEPAGE="http://www.tau.ac.il/~stoledo/taucs/"
@@ -26,23 +26,28 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"
 
+src_prepare() {
+	# test with cilk has memory leaks
+	epatch "${FILESDIR}"/${P}-no-test-cilk.patch
+}
+
 src_configure() {
 	cat > config/linux_shared.mk <<-EOF
-		CFLAGS=${CFLAGS} -fPIC
 		FC=$(tc-getFC)
 		CC=$(tc-getCC)
+		CFLAGS=${CFLAGS} -fPIC
 		FFLAGS=${FFLAGS} -fPIC
 		LDFLAGS=${LDFLAGS} -fPIC
 		LIBBLAS=$(pkg-config --libs blas)
 		LIBLAPACK=$(pkg-config --libs lapack)
 		LIBF77=
 	EOF
-	[[ $(tc-getFC) =~ fortran ]] && echo "LIBF77=-lgfortran" >> config/linux_shared.mk
+
 	echo "LIBMETIS=$(pkg-config --libs metis)" >> config/linux_shared.mk
 	# no cat <<EOF because -o has a trailing space
 	if use cilk; then
 		echo "CILKC=cilkc" >> config/linux_shared.mk
-		echo "CILKFLAGS=-O2 -I/usr/include/cilk -fPIC" >> config/linux_shared.mk
+		echo "CILKFLAGS=-O2 -I${EPREFIX}/usr/include/cilk -fPIC" >> config/linux_shared.mk
 		echo "CILKOUTFLG=-o " >> config/linux_shared.mk
 	fi
 	sed -e 's/ -fPIC//g' \
@@ -60,17 +65,16 @@ src_compile() {
 	emake
 
 	cd lib/linux_shared
-	$(tc-getAR) x libtaucs.a
-	$(tc-getLD) $(raw-ldflags) *.o \
-		-shared \
-		-soname libtaucs.so.1 \
-		-o libtaucs.so.1.0.0 \
+	$(tc-getFC) ${LDFLAGS} -shared -Wl,-soname=libtaucs.so.1 \
+		-Wl,--whole-archive libtaucs.a -Wl,--no-whole-archive \
 		$(pkg-config --libs blas lapack metis) \
+		-o libtaucs.so.1.0.0 \
 		|| die "shared lib linking failed"
 }
 
 src_test() {
-	./testscript variant=_static || die "compile test failed"
+	LD_LIBRARY_PATH=lib/linux_shared \
+		./testscript variant=_shared || die "compile test failed"
 	if grep -q FAILED testscript.log; then
 		eerror "Test failed. See ${S}/testscript.log"
 		die "test failed"
@@ -78,17 +82,13 @@ src_test() {
 }
 
 src_install() {
-	if use static-libs; then
-		dolib.a lib/linux_static/libtaucs.a
-	fi
-	dolib.so lib/linux_shared/libtaucs.so.1.0.0
-	dosym libtaucs.so.1.0.0 /usr/$(get_libdir)/libtaucs.so.1
-	dosym libtaucs.so.1 /usr/$(get_libdir)/libtaucs.so
+	use static-libs && dolib.a lib/linux_static/libtaucs.a
+	ln -s libtaucs.so.1.0.0 lib/linux_shared/libtaucs.so.1
+	ln -s libtaucs.so.1 lib/linux_shared/libtaucs.so
+	dolib.so lib/linux_shared/libtaucs.so*
 
 	insinto /usr/include
 	doins build/*/*.h src/*.h
 
-	use doc && \
-		insinto /usr/share/doc/${PF} && \
-		doins doc/*.pdf
+	use doc && dodoc doc/*.pdf
 }