Fixed parallel make failures in tests (see bug #295964).

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

4 files changed, 123 insertions, 14 deletions

diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog
index 09a5c4f1ab4a..bc1c68072414 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/lapack-reference
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/ChangeLog,v 1.48 2009/07/14 04:44:44 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/ChangeLog,v 1.49 2009/12/12 17:43:05 markusle Exp $
+
+  12 Dec 2009; Markus Dittrich <markusle@gentoo.org>
+  lapack-reference-3.2.1.ebuild,
+  +files/lapack-reference-3.2.1-parallel-make.patch:
+  Fixed parallel make failures in tests (see bug #295964).
 
 *lapack-reference-3.2.1 (13 Jul 2009)
 
diff --git a/sci-libs/lapack-reference/Manifest b/sci-libs/lapack-reference/Manifest
index ea45709baec2..3e4f2f9f9138 100644
--- a/sci-libs/lapack-reference/Manifest
+++ b/sci-libs/lapack-reference/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX eselect.lapack.reference 237 RMD160 f87f6c802089ce23b5d53cb40403ed32b9b9f866 SHA1 0ea7ca8961e4d7381618893c155fe582cd68d8c4 SHA256 2a72a6a9b49ec944656e164842907ee76d878a6772a7d71c1cb196d8beb6fa13
 AUX lapack-reference-3.1.1-test-fix.patch 2120 RMD160 9c37d349af207f0bbb6deb1ae88addb9676c73fc SHA1 bf73066396b08def6bcd81d0ce09aab682224cb1 SHA256 40c514db2bf9a08ce9630e53058ef3d863fd981c774987b233f6bdce3601a6f8
+AUX lapack-reference-3.2.1-parallel-make.patch 4904 RMD160 96696da22aacf7f998b35849dcd1b6b40ea6ee0e SHA1 172b372aa53293ae66fb1a37b1746de5f379542a SHA256 e730190be4361ff5e0c20c80ad8fb250d072684c16f57597fe9809a9e14e0b3e
 DIST lapack-3.2.1.tgz 4792502 RMD160 e8fabba2fdd944afbc02a83599cf45a0d721030d SHA1 c75223fdef3258c461370af5d2b889d580d7f38a SHA256 5825f83971157001fd4235514afe8ff5fc16e1c06b2e872e442c242efd6c166d
 DIST lapack-lite-3.1.1.tgz 5332509 RMD160 d81baafd1f0f9859d9f75ac9b658f743544b5f5b SHA1 1ec4ef90b544cf82bc7b4f770cee6fb46da457c5 SHA256 505a13272d0d71c45ea52be2de74b0562b234ea3ccf5160665c7a2ee74a58437
 DIST lapack-reference-3.1.1-autotools.patch.bz2 7233 RMD160 7a82e871a5bf9fa57088001c89203cd965b72af1 SHA1 0294125e7cdac514c025f8b1c8f24d4ec12c5dab SHA256 63e2c0b64118ca20aed3ca52dbc553ba924c242d3a0b07e6236dee99ede16802
 DIST lapack-reference-3.2.1-autotools.patch.bz2 13338 RMD160 2c616267acae83f752533ff58e4911397bc1bb48 SHA1 3b054555405deccf84e090843803ab6babb71cb0 SHA256 de2ab4ea9723f549c77b38d932e5ddb55b7b5583b0050e527505210460dcdf76
 EBUILD lapack-reference-3.1.1-r1.ebuild 2722 RMD160 e5a6b369dc54b2a90a4e3bef9e3d8fd9a80af88b SHA1 a3871e86351638645d1ba9359d1790864a946832 SHA256 1fcfe9923c021c7a87c37c094b84d06608e2f0108d7ba738e6840be80e5627b8
-EBUILD lapack-reference-3.2.1.ebuild 2704 RMD160 42e332ef7aa2f4115b4963ec0a19342a4baf66b5 SHA1 5e7d3ea3087e6279b5929c1891f9adbbb4e173e7 SHA256 6182b40197895e08d6a191f75b557edf2dfab5c71226bd1c571ac2a5cfdc9269
-MISC ChangeLog 8439 RMD160 b39ddf93cc684872a3a83dc08ef01203f47667f0 SHA1 fcbeac1bd3e7843332063899431017b2eae25de5 SHA256 5a197cfd6ab6978a24c1477837ece2dca68c56e33fabc24e2e6b20368b01f35f
+EBUILD lapack-reference-3.2.1.ebuild 2751 RMD160 8c6707eac5881bd30c40c4e2e7efab9c7f869fbf SHA1 65d95481cb74747fc5146b0c0f159fc0771d9db7 SHA256 5df1d82f22a1e04ed1217d32b888fe5b9e85d1417f389ac851d6d1091ac9ced9
+MISC ChangeLog 8642 RMD160 b4cc37593e3f0b8a9daab36958e4e5fff74dc754 SHA1 a4b8269c35b6e029dc1140119ff109390f9b9fce SHA256 15c3f48d2384cb77f7760c65a895de8fd2e38f2d5246157ff92546f2eb8c9c78
 MISC metadata.xml 594 RMD160 13588b9b3bfc11c2818d846723bf2f5e376e3650 SHA1 f5ea3820ca5fc7a2973c3d19329b1f7fa3f5e427 SHA256 f08ce9a146655d7bbb3b21a408816e91f86dfcd9f1d1f7868f8edd5e5416c466
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpcDUMACgkQV3J2n04Eauy3AQCg3N23OPsyhONR2LcHZLdWETw0
-dKkAn1cjs/sAtelpzEVOaa6/F9v0MVMK
-=cNro
------END PGP SIGNATURE-----
diff --git a/sci-libs/lapack-reference/files/lapack-reference-3.2.1-parallel-make.patch b/sci-libs/lapack-reference/files/lapack-reference-3.2.1-parallel-make.patch
new file mode 100644
index 000000000000..72bc71ca2d95
--- /dev/null
+++ b/sci-libs/lapack-reference/files/lapack-reference-3.2.1-parallel-make.patch
@@ -0,0 +1,112 @@
+diff -Nauru lapack-3.2.1.old/TESTING/EIG/Makefile lapack-3.2.1/TESTING/EIG/Makefile
+--- lapack-3.2.1.old/TESTING/EIG/Makefile	2008-11-17 17:51:24.000000000 -0500
++++ lapack-3.2.1/TESTING/EIG/Makefile	2009-12-12 11:23:22.000000000 -0500
+@@ -126,25 +126,25 @@
+ double: ../xeigtstd
+ complex16: ../xeigtstz
+ 
+-../xeigtsts: $(SEIGTST) $(SCIGTST) $(AEIGTST) ; \
+-          $(LOADER) $(LOADOPTS) -o xeigtsts \
+-          $(SEIGTST) $(SCIGTST) $(AEIGTST) ../../$(TMGLIB) \
+-	  ../../$(LAPACKLIB) $(BLASLIB) && mv xeigtsts $@
+-
+-../xeigtstc: $(CEIGTST) $(SCIGTST) $(AEIGTST) ; \
+-          $(LOADER) $(LOADOPTS) -o xeigtstc \
+-          $(CEIGTST) $(SCIGTST) $(AEIGTST) ../../$(TMGLIB) \
+-	  ../../$(LAPACKLIB) $(BLASLIB) && mv xeigtstc $@
+-
+-../xeigtstd: $(DEIGTST) $(DZIGTST) $(AEIGTST) ; \
+-          $(LOADER) $(LOADOPTS) -o xeigtstd \
+-          $(DEIGTST) $(DZIGTST) $(AEIGTST) ../../$(TMGLIB) \
+-	  ../../$(LAPACKLIB) $(BLASLIB) && mv xeigtstd $@
+-
+-../xeigtstz: $(ZEIGTST) $(DZIGTST) $(AEIGTST) ; \
+-          $(LOADER) $(LOADOPTS) -o xeigtstz \
+-          $(ZEIGTST) $(DZIGTST) $(AEIGTST) ../../$(TMGLIB) \
+-	  ../../$(LAPACKLIB) $(BLASLIB) && mv xeigtstz $@
++../xeigtsts: $(SEIGTST) $(SCIGTST) $(AEIGTST)
++	$(LOADER) $(LOADOPTS) \
++	$(SEIGTST) $(SCIGTST) $(AEIGTST) ../../$(TMGLIB) \
++	../../$(LAPACKLIB) $(BLASLIB) -o ../xeigtsts 
++
++../xeigtstc: $(CEIGTST) $(SCIGTST) $(AEIGTST)
++	$(LOADER) $(LOADOPTS) \
++	$(CEIGTST) $(SCIGTST) $(AEIGTST) ../../$(TMGLIB) \
++	../../$(LAPACKLIB) $(BLASLIB) -o ../xeigtstc 
++
++../xeigtstd: $(DEIGTST) $(DZIGTST) $(AEIGTST)
++	$(LOADER) $(LOADOPTS) \
++	$(DEIGTST) $(DZIGTST) $(AEIGTST) ../../$(TMGLIB) \
++	../../$(LAPACKLIB) $(BLASLIB) -o ../xeigtstd
++
++../xeigtstz: $(ZEIGTST) $(DZIGTST) $(AEIGTST)
++	$(LOADER) $(LOADOPTS) \
++	$(ZEIGTST) $(DZIGTST) $(AEIGTST) ../../$(TMGLIB) \
++	../../$(LAPACKLIB) $(BLASLIB) -o ../xeigtstz
+ 
+ $(AEIGTST): $(FRC)
+ $(SCIGTST): $(FRC)
+@@ -169,4 +169,5 @@
+ zchkee.o: zchkee.f
+ 	$(FORTRAN) $(DRVOPTS) -c $< -o $@
+ 
+-.f.o : ; $(FORTRAN) $(OPTS) -c $< -o $@
++.f.o : 
++	$(FORTRAN) $(OPTS) -c $< -o $@
+diff -Nauru lapack-3.2.1.old/TESTING/LIN/Makefile lapack-3.2.1/TESTING/LIN/Makefile
+--- lapack-3.2.1.old/TESTING/LIN/Makefile	2009-02-10 12:23:05.000000000 -0500
++++ lapack-3.2.1/TESTING/LIN/Makefile	2009-12-12 07:22:41.000000000 -0500
+@@ -238,43 +238,43 @@
+ 
+ ../xlintsts : $(ALINTST) $(SLINTST) $(SCLNTST)
+ 	$(LOADER) $(LOADOPTS)  $(ALINTST) $(SCLNTST) $(SLINTST) \
+-        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB)  $(BLASLIB) -o xlintsts && mv xlintsts $@
++        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB)  $(BLASLIB) -o ../xlintsts 
+ 
+ ../xlintstc : $(ALINTST) $(CLINTST) $(SCLNTST)
+ 	$(LOADER) $(LOADOPTS)  $(ALINTST) $(SCLNTST) $(CLINTST) \
+-        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB)  $(BLASLIB) -o xlintstc && mv xlintstc $@
++        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB)  $(BLASLIB) -o ../xlintstc 
+  
+ ../xlintstd : $(ALINTST) $(DLINTST) $(DZLNTST)
+ 	$(LOADER) $(LOADOPTS) $^ \
+-        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB) $(BLASLIB) -o xlintstd && mv xlintstd $@
++        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB) $(BLASLIB) -o ../xlintstd 
+  
+ ../xlintstz : $(ALINTST) $(ZLINTST) $(DZLNTST)
+ 	$(LOADER) $(LOADOPTS)  $(ALINTST) $(DZLNTST) $(ZLINTST) \
+-        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB)  $(BLASLIB) -o xlintstz && mv xlintstz $@
++        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB)  $(BLASLIB) -o ../xlintstz 
+  
+ ../xlintstds : $(DSLINTST)
+ 	$(LOADER) $(LOADOPTS)  $(DSLINTST) \
+-        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o xlintstds && mv xlintstds $@
++        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o ../xlintstds 
+  
+ ../xlintstzc : $(ZCLINTST)
+ 	$(LOADER) $(LOADOPTS)  $(ZCLINTST) \
+-        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o xlintstzc && mv xlintstzc $@
++        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o ../xlintstzc 
+  
+ ../xlintstrfs : $(SLINTSTRFP)
+ 	$(LOADER) $(LOADOPTS)  $(SLINTSTRFP) \
+-        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o xlintstrfs && mv xlintstrfs $@
++        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o ../xlintstrfs 
+  
+ ../xlintstrfd : $(DLINTSTRFP)
+ 	$(LOADER) $(LOADOPTS)  $(DLINTSTRFP) \
+-        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o xlintstrfd && mv xlintstrfd $@
++        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o ../xlintstrfd
+  
+ ../xlintstrfc : $(CLINTSTRFP)
+ 	$(LOADER) $(LOADOPTS)  $(CLINTSTRFP) \
+-        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o xlintstrfc && mv xlintstrfc $@
++        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o ../xlintstrfc 
+  
+ ../xlintstrfz : $(ZLINTSTRFP)
+ 	$(LOADER) $(LOADOPTS)  $(ZLINTSTRFP) \
+-        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o xlintstrfz && mv xlintstrfz $@
++        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o ../xlintstrfz
+  
+ $(ALINTST): $(FRC)
+ $(SCLNTST): $(FRC)
diff --git a/sci-libs/lapack-reference/lapack-reference-3.2.1.ebuild b/sci-libs/lapack-reference/lapack-reference-3.2.1.ebuild
index 838c95d0ac97..02249ea201ea 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.2.1.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/lapack-reference-3.2.1.ebuild,v 1.1 2009/07/14 01:57:15 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/lapack-reference-3.2.1.ebuild,v 1.2 2009/12/12 17:43:05 markusle Exp $
 
 inherit eutils autotools flag-o-matic fortran multilib
 
@@ -41,6 +41,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${WORKDIR}"/${PN}-${PATCH_V}-autotools.patch
+	epatch "${FILESDIR}"/${P}-parallel-make.patch
 	eautoreconf
 
 	# set up the testing routines