summaryrefslogtreecommitdiff
path: root/math/scalapack/files/SLmake.inc-mpich.diff
diff options
context:
space:
mode:
authorMaho Nakata <maho@FreeBSD.org>2007-10-07 08:13:43 +0000
committerMaho Nakata <maho@FreeBSD.org>2007-10-07 08:13:43 +0000
commitbdcb9f0e58f826441a8e077b50812580898b5ae1 (patch)
treec69f31f8d51f3661f6fa53759239e70ba6e4eb1a /math/scalapack/files/SLmake.inc-mpich.diff
parent. Update to 4.2.2. (diff)
Update to 1.8.0. Openmpi part is not updated at the moment.
Diffstat (limited to 'math/scalapack/files/SLmake.inc-mpich.diff')
-rw-r--r--math/scalapack/files/SLmake.inc-mpich.diff31
1 files changed, 16 insertions, 15 deletions
diff --git a/math/scalapack/files/SLmake.inc-mpich.diff b/math/scalapack/files/SLmake.inc-mpich.diff
index f2cc9fae9916..e24f66bd150a 100644
--- a/math/scalapack/files/SLmake.inc-mpich.diff
+++ b/math/scalapack/files/SLmake.inc-mpich.diff
@@ -1,5 +1,5 @@
---- SLmake.inc.old Wed Mar 7 14:01:14 2007
-+++ SLmake.inc Wed Mar 7 14:01:29 2007
+--- SLmake.inc.example 2007-04-04 13:24:52.000000000 +0900
++++ SLmake.inc.example 2007-10-06 18:47:01.000000000 +0900
@@ -19,26 +19,26 @@
# The complete path to the top level of ScaLAPACK directory, usually
# $(HOME)/SCALAPACK
@@ -27,32 +27,31 @@
-BLACSFINIT = $(BLACSdir)/libmpiblacsF77init-p4.a
-BLACSCINIT = $(BLACSdir)/libmpiblacsCinit-p4.a
-BLACSLIB = $(BLACSdir)/libmpiblacs-p4.a
-+SMPLIB = @LOCALBASE@/mpich2/lib/libmpich.a
-+BLACSFINIT = $(BLACSdir)/libblacsf77.a
-+BLACSCINIT = $(BLACSdir)/libblacsc.a
-+BLACSLIB = $(BLACSdir)/libblacs.a
++SMPLIB = -L@LOCALBASE@/mpich2 -lmpich
++BLACSFINIT = $(BLACSdir)/libblacsf77.a #-L$(BLACSdir) -lblacsf77
++BLACSCINIT = $(BLACSdir)/libblacsc.a #-L$(BLACSdir) -lblacsc
++BLACSLIB = $(BLACSdir)/libblacs.a #-L$(BLACSdir) -lblacs
TESTINGdir = $(home)/TESTING
#
-@@ -67,12 +67,12 @@
+@@ -67,11 +67,11 @@
#
# The fortran and C compilers, loaders, and their flags
#
--F77 = g77
-+F77 = @F77@
- #F77 = /usr/local/pgi/linux86/bin/pgf77
--CC = gcc
+-F77 = mpif77
+-CC = mpicc
-NOOPT =
-F77FLAGS = -O3 $(NOOPT)
-CCFLAGS = -O4
-+CC = @CC@
++F77 = @MPIF77@
++CC = @MPICC@
+NOOPT = @NOOPT@
+F77FLAGS = @FFLAGS@
+CCFLAGS = @CFLAGS@
SRCFLAG =
F77LOADER = $(F77)
CCLOADER = $(CC)
-@@ -82,7 +82,7 @@
+@@ -81,7 +81,7 @@
# C preprocessor defs for compilation
# (-DNoChange, -DAdd_, -DUpCase, or -Df77IsF2C)
#
@@ -61,12 +60,14 @@
#
# 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 @@
+@@ -93,8 +93,8 @@
# 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
+-LAPACKLIB = /usr/local/lib/liblapack.a
+BLASLIB = -L@LOCALBASE@/lib @BLAS@
++LAPACKLIB = -L@LOCALBASE@/lib @LAPACK@
#
- PBLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB)
+ PBLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(LAPACKLIB) $(BLASLIB) $(SMPLIB)
PRLIBS = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB)