rpms/scalapack/FC-3 scalapack-1.7-64bitlibs.patch, 1.1, 1.2 scalapack-1.7-fedora3.patch, 1.1, 1.2 scalapack.spec, 1.8, 1.9

Tom Callaway (spot) fedora-extras-commits at redhat.com
Wed Mar 1 00:22:50 UTC 2006


Author: spot

Update of /cvs/extras/rpms/scalapack/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12811/FC-3

Modified Files:
	scalapack-1.7-64bitlibs.patch scalapack-1.7-fedora3.patch 
	scalapack.spec 
Log Message:

Big rework of scalapack, now with shared libs


scalapack-1.7-64bitlibs.patch:

Index: scalapack-1.7-64bitlibs.patch
===================================================================
RCS file: /cvs/extras/rpms/scalapack/FC-3/scalapack-1.7-64bitlibs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scalapack-1.7-64bitlibs.patch	15 May 2005 18:40:34 -0000	1.1
+++ scalapack-1.7-64bitlibs.patch	1 Mar 2006 00:22:49 -0000	1.2
@@ -1,6 +1,6 @@
---- scalapack-1.7/SCALAPACK/SLmake.inc.BAD	2005-05-15 01:31:17.366972464 -0500
-+++ scalapack-1.7/SCALAPACK/SLmake.inc	2005-05-15 01:31:53.333504720 -0500
-@@ -29,13 +29,13 @@
+--- 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 @@
  #  and the directory where the BLACS libraries are
  #
  BLACSDBGLVL   = 0
@@ -9,22 +9,3 @@
  #
  #  MPI setup; tailor to your system if using MPIBLACS
  #  Will need to comment out these 6 lines if using PVM
- #
- USEMPI        = -DUsingMpiBlacs
--SMPLIB        = /usr/lib/libmpi.a
-+SMPLIB        = /usr/lib64/libmpi.a
- BLACSFINIT    = $(BLACSdir)/libmpiblacsF77init.a
- BLACSCINIT    = $(BLACSdir)/libmpiblacsCinit.a
- BLACSLIB      = $(BLACSdir)/libmpiblacs.a
-@@ -94,9 +94,9 @@
- #  The name of the libraries to be created/linked to
- #
- SCALAPACKLIB  = $(home)/libscalapack.a
--BLASLIB       = /usr/lib/libblas.a
-+BLASLIB       = /usr/lib64/libblas.a
- #
--LAMLIBS       = /usr/lib/liblam.a /usr/lib/liblamf77mpi.a
-+LAMLIBS       = /usr/lib64/liblam.a /usr/lib64/liblamf77mpi.a
- EXTRALIBS     = -ldl -lpthread -llam -lmpi -llamf77mpi
- 
- PBLIBS        = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS)

scalapack-1.7-fedora3.patch:

Index: scalapack-1.7-fedora3.patch
===================================================================
RCS file: /cvs/extras/rpms/scalapack/FC-3/scalapack-1.7-fedora3.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scalapack-1.7-fedora3.patch	9 May 2005 03:40:40 -0000	1.1
+++ scalapack-1.7-fedora3.patch	1 Mar 2006 00:22:49 -0000	1.2
@@ -1,5 +1,5 @@
---- scalapack-1.7/SCALAPACK/SLmake.inc.orig	2001-08-08 21:59:50.000000000 -0500
-+++ scalapack-1.7/SCALAPACK/SLmake.inc	2005-05-08 22:38:39.000000000 -0500
+--- scalapack-1.7/SCALAPACK/SLmake.inc.patch1	2001-08-08 21:59:50.000000000 -0500
++++ scalapack-1.7/SCALAPACK/SLmake.inc	2006-02-14 09:09:21.000000000 -0600
 @@ -19,7 +19,7 @@
  #  The complete path to the top level of ScaLAPACK directory, usually
  #  $(HOME)/SCALAPACK
@@ -24,10 +24,10 @@
 -BLACSFINIT    = $(BLACSdir)/libmpiblacsF77init-p4.a
 -BLACSCINIT    = $(BLACSdir)/libmpiblacsCinit-p4.a
 -BLACSLIB      = $(BLACSdir)/libmpiblacs-p4.a
-+SMPLIB        = /usr/lib/libmpi.a
-+BLACSFINIT    = $(BLACSdir)/libmpiblacsF77init.a
-+BLACSCINIT    = $(BLACSdir)/libmpiblacsCinit.a
-+BLACSLIB      = $(BLACSdir)/libmpiblacs.a
++SMPLIB        = -lmpi
++BLACSFINIT    = -lmpiblacsF77init
++BLACSCINIT    = -lmpiblacsCinit
++BLACSLIB      = -lmpiblacs
  TESTINGdir    = $(home)/TESTING
  
  #
@@ -37,25 +37,44 @@
  NOOPT         = 
 -F77FLAGS      =  -O3 $(NOOPT)
 -CCFLAGS       = -O4
-+F77FLAGS      = $(RPM_OPT_FLAGS) $(NOOPT)
-+CCFLAGS       = $(RPM_OPT_FLAGS)
++F77FLAGS      = $(RPM_OPT_FLAGS) $(NOOPT) -fPIC
++CCFLAGS       = $(RPM_OPT_FLAGS) -fPIC
  SRCFLAG       =
  F77LOADER     = $(F77)
  CCLOADER      = $(CC)
-@@ -94,9 +94,12 @@
+@@ -94,9 +94,13 @@
  #  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       = /usr/lib/libblas.a
++SCALAPACKSLIB = -L$(home) -lscalapack
++BLASLIB       = -lblas
  #
 -PBLIBS        = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB)
 -PRLIBS        = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB)
 -RLIBS         = $(SCALAPACKLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB)
-+LAMLIBS       = /usr/lib/liblam.a /usr/lib/liblamf77mpi.a
-+EXTRALIBS     = -ldl -lpthread -llam -lmpi -llamf77mpi
++LAMLIBS       = -llam -lmpi -llamf77mpi
++EXTRALIBS     = -ldl -lpthread -lutil
 +
-+PBLIBS        = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS)
-+PRLIBS        = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS)
-+RLIBS         = $(SCALAPACKLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS)
++PBLIBS        = $(SCALAPACKSLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS)
++PRLIBS        = $(SCALAPACKSLIB) $(CBLACSLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS)
++RLIBS         = $(SCALAPACKSLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS)
  LIBS          = $(PBLIBS)
+--- scalapack-1.7/SCALAPACK/Makefile.BAD	2006-02-14 09:11:43.000000000 -0600
++++ scalapack-1.7/SCALAPACK/Makefile	2006-02-14 09:12:35.000000000 -0600
+@@ -49,7 +49,7 @@
+ all: lib
+ #all: lib exe
+ 
+-lib: toolslib pblaslib redistlib scalapacklib
++lib: toolslib pblaslib redistlib scalapacklib shared
+ 
+ exe: pblasexe redistexe scalapackexe
+ 
+@@ -90,3 +90,6 @@
+ 	( cd $(SRCdir); $(MAKE) clean )
+ 	( cd $(TOOLSdir); $(MAKE) clean )
+ 	( cd $(REDISTdir)/SRC; $(MAKE) clean )
++
++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 .. )


Index: scalapack.spec
===================================================================
RCS file: /cvs/extras/rpms/scalapack/FC-3/scalapack.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- scalapack.spec	9 Jan 2006 20:51:25 -0000	1.8
+++ scalapack.spec	1 Mar 2006 00:22:49 -0000	1.9
@@ -1,14 +1,14 @@
 Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers
 Name: scalapack
 Version: 1.7
-Release: 9%{?dist}
+Release: 11%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/scalapack/scalapack_home.html
 Source0: http://www.netlib.org/scalapack/scalapack.tgz
-BuildRequires: lapack, blas, lam, blacs-devel
-BuildRequires: gcc-g77
-Requires: lapack, blas, lam, blacs
+BuildRequires: lapack-devel, blas-devel, lam, blacs-devel
+BuildRequires: gcc-g77, glibc-devel
+Requires: lapack, blas-devel, lam, blacs-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: scalapack-1.7-fedora3.patch
 Patch1: scalapack-1.7-64bitlibs.patch
@@ -39,6 +39,14 @@
 BLACS. One of the design goals of ScaLAPACK was to have the ScaLAPACK 
 routines resemble their LAPACK equivalents as much as possible. 
 
+%package devel
+Summary: Development libraries for scalapack
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+This package contains development libraries for scalapack.
+
 %prep
 %setup -q -c -n %{name}-%{version}
 %patch0 -p1
@@ -60,8 +68,18 @@
 cp -f INSTALL/scalapack_install.ps ../
 cp -f README ../
 cp -f libscalapack.a ${RPM_BUILD_ROOT}%{_libdir}
+cp -f libscalapack.so* ${RPM_BUILD_ROOT}%{_libdir}
 cp -f TESTING/x* ${RPM_BUILD_ROOT}%{_bindir}
 
+cd ${RPM_BUILD_ROOT}%{_libdir}
+ln -fs libscalapack.so.1.0.0 libscalapack.so.1
+ln -s libscalapack.so.1.0.0 libscalapack.so
+cd ..
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
 %clean
 rm -fr ${RPM_BUILD_ROOT}
 
@@ -69,9 +87,22 @@
 %defattr(-,root,root)
 %doc scalapack_install.ps README
 %{_bindir}/x*
+%{_libdir}/libscalapack.so.*
+
+%files devel
+%defattr(-,root,root)
 %{_libdir}/libscalapack.a
+%{_libdir}/libscalapack.so
 
 %changelog
+* Sun Feb 26 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.7-11
+- fix 64 bit builds
+- enable shared libraries
+- split package into base and devel
+
+* Tue Feb 14 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.7-10
+- Incorporate Andrew Gormanly's fixes
+
 * Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.7-9
 - fix BR
 
@@ -81,7 +112,7 @@
 * Sun May 15 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.7-7
 - 64 bit library fix
 
-* Mon May  9 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.7-5
+* Mon May  9 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.7-6
 - remove hardcoded dist tags
 
 * Sun May  8 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.7-4




More information about the fedora-extras-commits mailing list