Honor FC and FFLAGS so that the user can easily override them.

Enable testing and timing if ENABLE_TESTING is set to YES so that the user
can check how the changes to FC and FFLAGS work.
Patches to workaround the SIGFPE stuff and g77's code checking.
Update pkg/DESCR.
Submitted by:	AMAKAWA Shuhei <sa264@cam.ac.uk>

2 files changed, 97 insertions, 15 deletions

diff --git a/math/lapack/files/patch-aa b/math/lapack/files/patch-aa
index 213135662c06..c7bc38648443 100644
--- a/math/lapack/files/patch-aa
+++ b/math/lapack/files/patch-aa
@@ -1,5 +1,5 @@
---- make.inc~	Mon Jun 28 11:29:38 1999
-+++ make.inc	Tue Sep 21 17:54:48 1999
+--- make.inc.orig	Mon Jun 28 10:29:38 1999
++++ make.inc	Wed Oct  6 11:12:08 1999
 @@ -8,7 +8,7 @@
  #
  #  The machine (platform) identifier to append to the library names
@@ -9,31 +9,40 @@
  #  
  #  Modify the FORTRAN and OPTS definitions to refer to the
  #  compiler and desired compiler options for your machine.  NOOPT
-@@ -19,13 +19,13 @@
- FORTRAN  = f77
+@@ -16,16 +16,18 @@
+ #  selected.  Define LOADER and LOADOPTS to refer to the loader and 
+ #  desired load options for your machine.
+ #
+-FORTRAN  = f77
++FORTRAN  = $(FC)
  #OPTS     = -O4 -u -f -mt
++#OPTS     = -O4 -u -f -mt
++#OPTS     = -u -f -dalign -native -xO5 -xarch=v8plusa
  #OPTS     = -u -f -dalign -native -xO5 -xarch=v8plusa
 -OPTS     = -u -f -dalign -native -xO5 -xarch=v8plusa
-+#OPTS     = -u -f -dalign -native -xO5 -xarch=v8plusa
++OPTS     = $(FFLAGS)
  DRVOPTS  = $(OPTS)
 -NOOPT    = -u -f
 +#NOOPT    = -u -f
  #NOOPT    = -u -f -mt
- LOADER   = f77
+-LOADER   = f77
++LOADER   = $(FC)
  #LOADOPTS = -mt
 -LOADOPTS = -f -dalign -native -xO5 -xarch=v8plusa
 +#LOADOPTS = -f -dalign -native -xO5 -xarch=v8plusa
  #
  #  The archiver and the flag(s) to use when building archive (library)
  #  If you system has no ranlib, set RANLIB = echo.
-@@ -40,8 +40,8 @@
+@@ -40,8 +42,9 @@
  #
  #BLASLIB      = ../../blas$(PLAT).a
  #BLASLIB     = -xlic_lib=sunperf_mt
 -BLASLIB     = -xlic_lib=sunperf
 -LAPACKLIB    = lapack$(PLAT).a
+-TMGLIB       = tmglib$(PLAT).a
 +BLASLIB     =../../BLAS/SRC/libblas.a
 +LAPACKLIB    = SRC/liblapack.a
- TMGLIB       = tmglib$(PLAT).a
++TMGLIB       = TESTING/MATGEN/libtmg.a
  EIGSRCLIB    = eigsrc$(PLAT).a
  LINSRCLIB    = linsrc$(PLAT).a
++FPMCLR       = ../../fpmclr_.o
diff --git a/math/lapack/files/patch-ac b/math/lapack/files/patch-ac
index 6e7fda17e1f4..76846c97c838 100644
--- a/math/lapack/files/patch-ac
+++ b/math/lapack/files/patch-ac
@@ -1,15 +1,23 @@
---- Makefile.orig	Tue Jun 22 14:29:44 1999
-+++ Makefile	Tue Sep 21 21:02:17 1999
-@@ -6,19 +6,20 @@
+--- Makefile.orig	Tue Jun 22 13:29:44 1999
++++ Makefile	Mon Oct 11 11:31:35 1999
+@@ -6,19 +6,27 @@
  
  include make.inc
  
--all: install lib testing blas_testing timing blas_timing
-+all: install lib # testing blas_testing timing blas_timing
- 
++.if defined(ENABLE_TESTING) && ${ENABLE_TESTING} == "YES"
+ all: install lib testing blas_testing timing blas_timing
+-
 -lib: lapacklib tmglib
+-#lib: blaslib lapacklib tmglib
++.else
++all: install lib
++.endif
++
++.if defined(ENABLE_TESTING) && ${ENABLE_TESTING} == "YES"
++lib: blaslib lapacklib tmglib fpmclr_.o
++.else
 +lib: lapacklib blaslib
- #lib: blaslib lapacklib tmglib
++.endif
  
  clean: cleanlib cleantesting cleantiming
  
@@ -26,3 +34,68 @@
  
  blaslib:
  	( cd BLAS/SRC; $(MAKE) )
+@@ -34,40 +42,40 @@
+ 
+ blas_testing:
+ 	( cd BLAS/TESTING; $(MAKE) -f Makeblat1 )
+-	( cd BLAS; xblat1s > sblat1.out; \
+-	           xblat1d > dblat1.out; \
+-	           xblat1c > cblat1.out; \
+-	           xblat1z > zblat1.out )
++	( cd BLAS; ./xblat1s > sblat1.out; \
++	           ./xblat1d > dblat1.out; \
++	           ./xblat1c > cblat1.out; \
++	           ./xblat1z > zblat1.out )
+ 
+ 	( cd BLAS/TESTING; $(MAKE) -f Makeblat2 )
+-	( cd BLAS; xblat2s < sblat2.in ; \
+-	           xblat2d < dblat2.in ; \
+-	           xblat2c < cblat2.in ; \
+-	           xblat2z < zblat2.in )
++	( cd BLAS; ./xblat2s < sblat2.in ; \
++	           ./xblat2d < dblat2.in ; \
++	           ./xblat2c < cblat2.in ; \
++	           ./xblat2z < zblat2.in )
+ 
+ 	( cd BLAS/TESTING; $(MAKE) -f Makeblat3 )
+-	( cd BLAS; xblat3s < sblat3.in ; \
+-	           xblat3d < dblat3.in ; \
+-	           xblat3c < cblat3.in ; \
+-	           xblat3z < zblat3.in )
++	( cd BLAS; ./xblat3s < sblat3.in ; \
++	           ./xblat3d < dblat3.in ; \
++	           ./xblat3c < cblat3.in ; \
++	           ./xblat3z < zblat3.in )
+ 
+ timing:
+ 	( cd TIMING; $(MAKE) )
+ 
+ blas_timing:
+ 	( cd TIMING/LIN; $(MAKE) )
+-	( cd TIMING; xlintims < sblasa.in > sblasa.out ; \
+-	             xlintims < sblasb.in > sblasb.out ; \
+-	             xlintims < sblasc.in > sblasc.out )
+-	( cd TIMING; xlintimd < dblasa.in > dblasa.out ; \
+-	             xlintimd < dblasb.in > dblasb.out ; \
+-	             xlintimd < dblasc.in > dblasc.out )
+-	( cd TIMING; xlintimc < cblasa.in > cblasa.out ; \
+-	             xlintimc < cblasb.in > cblasb.out ; \
+-	             xlintimc < cblasc.in > cblasc.out )
+-	( cd TIMING; xlintimz < zblasa.in > zblasa.out ; \
+-	             xlintimz < zblasb.in > zblasb.out ; \
+-	             xlintimz < zblasc.in > zblasc.out )
++	( cd TIMING; ./xlintims < sblasa.in > sblasa.out ; \
++	             ./xlintims < sblasb.in > sblasb.out ; \
++	             ./xlintims < sblasc.in > sblasc.out )
++	( cd TIMING; ./xlintimd < dblasa.in > dblasa.out ; \
++	             ./xlintimd < dblasb.in > dblasb.out ; \
++	             ./xlintimd < dblasc.in > dblasc.out )
++	( cd TIMING; ./xlintimc < cblasa.in > cblasa.out ; \
++	             ./xlintimc < cblasb.in > cblasb.out ; \
++	             ./xlintimc < cblasc.in > cblasc.out )
++	( cd TIMING; ./xlintimz < zblasa.in > zblasa.out ; \
++	             ./xlintimz < zblasb.in > zblasb.out ; \
++	             ./xlintimz < zblasc.in > zblasc.out )
+ 
+ cleanlib:
+ 	( cd INSTALL; $(MAKE) clean )