diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2007-03-09 01:20:38 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2007-03-09 01:20:38 +0000 |
| commit | bc99e3cf8ec0cfc85d0449176bdaf28e8667dc3f (patch) | |
| tree | bde2fd916b55a755406b176fa3f7eef53a5bfc44 /math/scalapack/files | |
| parent | * Install shared libs as well. (diff) | |
* Update to 1.7.5.
* Install shared libs as well.
Diffstat (limited to 'math/scalapack/files')
| -rw-r--r-- | math/scalapack/files/SLmake.inc-mpich.diff | 30 | ||||
| -rw-r--r-- | math/scalapack/files/SLmake.inc-openmpi.diff | 18 |
2 files changed, 28 insertions, 20 deletions
diff --git a/math/scalapack/files/SLmake.inc-mpich.diff b/math/scalapack/files/SLmake.inc-mpich.diff index e9f389e71d58..f2cc9fae9916 100644 --- a/math/scalapack/files/SLmake.inc-mpich.diff +++ b/math/scalapack/files/SLmake.inc-mpich.diff @@ -1,5 +1,5 @@ ---- SLmake.inc.orig Thu Aug 9 11:59:50 2001 -+++ SLmake.inc Mon May 5 11:51:11 2003 +--- SLmake.inc.old Wed Mar 7 14:01:14 2007 ++++ SLmake.inc Wed Mar 7 14:01:29 2007 @@ -19,26 +19,26 @@ # The complete path to the top level of ScaLAPACK directory, usually # $(HOME)/SCALAPACK @@ -42,27 +42,16 @@ +F77 = @F77@ #F77 = /usr/local/pgi/linux86/bin/pgf77 -CC = gcc -+CC = @CC@ - NOOPT = +-NOOPT = -F77FLAGS = -O3 $(NOOPT) -CCFLAGS = -O4 ++CC = @CC@ ++NOOPT = @NOOPT@ +F77FLAGS = @FFLAGS@ +CCFLAGS = @CFLAGS@ SRCFLAG = F77LOADER = $(F77) CCLOADER = $(CC) -@@ -94,7 +94,7 @@ - # The name of the libraries to be created/linked to - # - SCALAPACKLIB = $(home)/libscalapack.a --BLASLIB = /usr/local/lib/libf77blas.a /usr/local/lib/libatlas.a -+BLASLIB = -L@LOCALBASE@/lib @BLAS@ - # - PBLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) - PRLIBS = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB) - ---- SLmake.inc~ Wed Jan 10 16:50:13 2007 -+++ SLmake.inc Wed Jan 10 16:54:40 2007 @@ -82,7 +82,7 @@ # C preprocessor defs for compilation # (-DNoChange, -DAdd_, -DUpCase, or -Df77IsF2C) @@ -72,3 +61,12 @@ # # The archiver and the flag(s) to use when building archive (library) # Also the ranlib routine. If your system has no ranlib, set RANLIB = echo +@@ -94,7 +94,7 @@ + # The name of the libraries to be created/linked to + # + SCALAPACKLIB = $(home)/libscalapack.a +-BLASLIB = /usr/local/lib/libf77blas.a /usr/local/lib/libatlas.a ++BLASLIB = -L@LOCALBASE@/lib @BLAS@ + # + PBLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) + PRLIBS = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB) diff --git a/math/scalapack/files/SLmake.inc-openmpi.diff b/math/scalapack/files/SLmake.inc-openmpi.diff index 6b60fbd8e810..cb749f023bd9 100644 --- a/math/scalapack/files/SLmake.inc-openmpi.diff +++ b/math/scalapack/files/SLmake.inc-openmpi.diff @@ -1,5 +1,5 @@ ---- SLmake.inc.orig Thu Aug 9 04:59:50 2001 -+++ SLmake.inc Mon Nov 13 15:45:36 2006 +--- SLmake.inc.orig Thu Jan 19 06:36:03 2006 ++++ SLmake.inc Wed Mar 7 14:03:20 2007 @@ -19,26 +19,26 @@ # The complete path to the top level of ScaLAPACK directory, usually # $(HOME)/SCALAPACK @@ -42,15 +42,25 @@ +F77 = mpif77 #F77 = /usr/local/pgi/linux86/bin/pgf77 -CC = gcc -+CC = mpicc - NOOPT = +-NOOPT = -F77FLAGS = -O3 $(NOOPT) -CCFLAGS = -O4 ++CC = mpicc ++NOOPT = @NOOPT@ +F77FLAGS = @FFLAGS@ +CCFLAGS = @CFLAGS@ SRCFLAG = F77LOADER = $(F77) CCLOADER = $(CC) +@@ -82,7 +82,7 @@ + # C preprocessor defs for compilation + # (-DNoChange, -DAdd_, -DUpCase, or -Df77IsF2C) + # +-CDEFS = -Df77IsF2C -DNO_IEEE $(USEMPI) ++CDEFS = -DAdd_ -DNO_IEEE $(USEMPI) + # + # The archiver and the flag(s) to use when building archive (library) + # Also the ranlib routine. If your system has no ranlib, set RANLIB = echo @@ -94,7 +94,7 @@ # The name of the libraries to be created/linked to # |