rpms/scalapack/devel scalapack-1.7-fedora.patch, 1.3, 1.4 scalapack.spec, 1.12, 1.13

Tom Callaway (spot) fedora-extras-commits at redhat.com
Wed Mar 8 16:58:14 UTC 2006


Author: spot

Update of /cvs/extras/rpms/scalapack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14206/devel

Modified Files:
	scalapack-1.7-fedora.patch scalapack.spec 
Log Message:

Fix NOOPT to be -fPIC.


scalapack-1.7-fedora.patch:

Index: scalapack-1.7-fedora.patch
===================================================================
RCS file: /cvs/extras/rpms/scalapack/devel/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	1 Mar 2006 00:23:02 -0000	1.3
+++ scalapack-1.7-fedora.patch	8 Mar 2006 16:58:14 -0000	1.4
@@ -1,5 +1,23 @@
---- 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
+--- 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
+@@ -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 .. )
+--- 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
 @@ -19,7 +19,7 @@
  #  The complete path to the top level of ScaLAPACK directory, usually
  #  $(HOME)/SCALAPACK
@@ -39,10 +57,11 @@
 +F77           = gfortran
  #F77           = /usr/local/pgi/linux86/bin/pgf77
  CC            = gcc
- NOOPT         = 
+-NOOPT         = 
 -F77FLAGS      =  -O3 $(NOOPT)
 -CCFLAGS       = -O4
-+F77FLAGS      = $(RPM_OPT_FLAGS) $(NOOPT) -fPIC
++NOOPT         = -fPIC
++F77FLAGS      = $(RPM_OPT_FLAGS) $(NOOPT)
 +CCFLAGS       = $(RPM_OPT_FLAGS) -fPIC
  SRCFLAG       =
  F77LOADER     = $(F77)
@@ -74,21 +93,3 @@
 +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/devel/scalapack.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- scalapack.spec	1 Mar 2006 00:23:02 -0000	1.12
+++ scalapack.spec	8 Mar 2006 16:58:14 -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: 11%{?dist}
+Release: 12%{?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-12
+- set -fPIC as NOOPT
+
 * Sun Feb 26 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.7-11
 - fix 64 bit builds
 - enable shared libraries




More information about the fedora-extras-commits mailing list