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

(Portage version: 2.1.7.11/cvs/Linux x86_64)

3 files changed, 120 insertions, 2 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/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