rpms/scalapack/FC-4 scalapack-1.7-64bitlibs.patch, 1.2, 1.3 scalapack-1.7-fedora.patch, 1.3, 1.4 scalapack.spec, 1.12, 1.13
Tom Callaway (spot)
fedora-extras-commits at redhat.com
Thu Mar 9 00:14:51 UTC 2006
- Previous message: rpms/scalapack/FC-3 scalapack-1.7-64bitlibs.patch, 1.2, 1.3 scalapack-1.7-fedora3.patch, 1.3, 1.4 scalapack.spec, 1.10, 1.11
- Next message: rpms/scalapack/devel scalapack-1.7-64bitlibs.patch, 1.2, 1.3 scalapack-1.7-fedora.patch, 1.4, 1.5 scalapack.spec, 1.13, 1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: spot
Update of /cvs/extras/rpms/scalapack/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1497/FC-4
Modified Files:
scalapack-1.7-64bitlibs.patch scalapack-1.7-fedora.patch
scalapack.spec
Log Message:
lam in Fedora Core moved its libs into %{_libdir}/lam, so we need to hokey pokey accordingly.
scalapack-1.7-64bitlibs.patch:
Index: scalapack-1.7-64bitlibs.patch
===================================================================
RCS file: /cvs/extras/rpms/scalapack/FC-4/scalapack-1.7-64bitlibs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scalapack-1.7-64bitlibs.patch 1 Mar 2006 00:22:56 -0000 1.2
+++ scalapack-1.7-64bitlibs.patch 9 Mar 2006 00:14:50 -0000 1.3
@@ -1,6 +1,6 @@
---- scalapack-1.7/SCALAPACK/SLmake.inc.BAD 2006-02-25 10:09:28.000000000 -0600
-+++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-02-25 10:14:14.000000000 -0600
-@@ -29,7 +29,7 @@
+--- scalapack-1.7/SCALAPACK/SLmake.inc.64bit 2006-03-08 18:10:40.000000000 -0600
++++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-03-08 18:11:04.000000000 -0600
+@@ -29,13 +29,13 @@
# and the directory where the BLACS libraries are
#
BLACSDBGLVL = 0
@@ -9,3 +9,19 @@
#
# MPI setup; tailor to your system if using MPIBLACS
# Will need to comment out these 6 lines if using PVM
+ #
+ USEMPI = -DUsingMpiBlacs
+-SMPLIB = -L/usr/lib/lam -lmpi
++SMPLIB = -L/usr/lib64/lam -lmpi
+ BLACSFINIT = -lmpiblacsF77init
+ BLACSCINIT = -lmpiblacsCinit
+ BLACSLIB = -lmpiblacs
+@@ -97,7 +97,7 @@
+ SCALAPACKSLIB = -L$(home) -lscalapack
+ BLASLIB = -lblas
+ #
+-LAMLIBS = -L/usr/lib/lam -llam -lmpi -llamf77mpi
++LAMLIBS = -L/usr/lib64/lam -llam -lmpi -llamf77mpi
+ EXTRALIBS = -ldl -lpthread -lutil
+
+ PBLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS)
scalapack-1.7-fedora.patch:
Index: scalapack-1.7-fedora.patch
===================================================================
RCS file: /cvs/extras/rpms/scalapack/FC-4/scalapack-1.7-fedora.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scalapack-1.7-fedora.patch 8 Mar 2006 16:58:08 -0000 1.3
+++ scalapack-1.7-fedora.patch 9 Mar 2006 00:14:50 -0000 1.4
@@ -1,5 +1,5 @@
--- scalapack-1.7/SCALAPACK/Makefile.fedora 2001-08-10 11:44:13.000000000 -0500
-+++ scalapack-1.7/SCALAPACK/Makefile 2006-03-08 10:41:39.000000000 -0600
++++ scalapack-1.7/SCALAPACK/Makefile 2006-03-08 18:08:21.000000000 -0600
@@ -49,7 +49,7 @@
all: lib
#all: lib exe
@@ -17,7 +17,7 @@
+shared: scalapacklib
+ ( mkdir tmp ; cp $(SCALAPACKLIB) tmp ; cd tmp ; ar x $(SCALAPACKLIB) ; gcc -shared -o $(home)/libscalapack.so.1.0.0 *.o -Wl,-soname=libscalapack.so.1 ; cd .. )
--- scalapack-1.7/SCALAPACK/SLmake.inc.fedora 2001-08-08 21:59:50.000000000 -0500
-+++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-03-08 10:42:41.000000000 -0600
++++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-03-08 18:09:05.000000000 -0600
@@ -19,7 +19,7 @@
# The complete path to the top level of ScaLAPACK directory, usually
# $(HOME)/SCALAPACK
@@ -42,7 +42,7 @@
-BLACSFINIT = $(BLACSdir)/libmpiblacsF77init-p4.a
-BLACSCINIT = $(BLACSdir)/libmpiblacsCinit-p4.a
-BLACSLIB = $(BLACSdir)/libmpiblacs-p4.a
-+SMPLIB = -lmpi
++SMPLIB = -L/usr/lib/lam -lmpi
+BLACSFINIT = -lmpiblacsF77init
+BLACSCINIT = -lmpiblacsCinit
+BLACSLIB = -lmpiblacs
@@ -62,7 +62,7 @@
-CCFLAGS = -O4
+NOOPT = -fPIC
+F77FLAGS = $(RPM_OPT_FLAGS) $(NOOPT)
-+CCFLAGS = $(RPM_OPT_FLAGS) -fPIC
++CCFLAGS = $(RPM_OPT_FLAGS) $(NOOPT)
SRCFLAG =
F77LOADER = $(F77)
CCLOADER = $(CC)
@@ -86,7 +86,7 @@
-PBLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB)
-PRLIBS = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB)
-RLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB)
-+LAMLIBS = -llam -lmpi -llamf77mpi
++LAMLIBS = -L/usr/lib/lam -llam -lmpi -llamf77mpi
+EXTRALIBS = -ldl -lpthread -lutil
+
+PBLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS)
Index: scalapack.spec
===================================================================
RCS file: /cvs/extras/rpms/scalapack/FC-4/scalapack.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- scalapack.spec 8 Mar 2006 16:58:08 -0000 1.12
+++ scalapack.spec 9 Mar 2006 00:14:50 -0000 1.13
@@ -1,7 +1,7 @@
Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers
Name: scalapack
Version: 1.7
-Release: 12%{?dist}
+Release: 13%{?dist}
License: Freely distributable
Group: Development/Libraries
URL: http://www.netlib.org/scalapack/scalapack_home.html
@@ -95,6 +95,9 @@
%{_libdir}/libscalapack.so
%changelog
+* Wed Mar 8 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.7-13
+- lam moved into _libdir/lam... need to fix patches
+
* Wed Mar 8 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.7-12
- set -fPIC as NOOPT
- Previous message: rpms/scalapack/FC-3 scalapack-1.7-64bitlibs.patch, 1.2, 1.3 scalapack-1.7-fedora3.patch, 1.3, 1.4 scalapack.spec, 1.10, 1.11
- Next message: rpms/scalapack/devel scalapack-1.7-64bitlibs.patch, 1.2, 1.3 scalapack-1.7-fedora.patch, 1.4, 1.5 scalapack.spec, 1.13, 1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list