rpms/scalapack/FC-3 scalapack-1.7-fedora3.patch, 1.2, 1.3 scalapack.spec, 1.9, 1.10

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


Author: spot

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

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

Fix NOOPT to be -fPIC.


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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scalapack-1.7-fedora3.patch	1 Mar 2006 00:22:49 -0000	1.2
+++ scalapack-1.7-fedora3.patch	8 Mar 2006 16:58:02 -0000	1.3
@@ -1,5 +1,5 @@
---- 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/SLmake.inc.fedora3	2006-03-08 10:51:28.000000000 -0600
++++ scalapack-1.7/SCALAPACK/SLmake.inc	2006-03-08 10:55:27.000000000 -0600
 @@ -19,7 +19,7 @@
  #  The complete path to the top level of ScaLAPACK directory, usually
  #  $(HOME)/SCALAPACK
@@ -31,14 +31,16 @@
  TESTINGdir    = $(home)/TESTING
  
  #
-@@ -71,8 +71,8 @@
+@@ -70,9 +70,9 @@
+ F77           = g77
  #F77           = /usr/local/pgi/linux86/bin/pgf77
  CC            = gcc
- NOOPT         = 
+-NOOPT         = 
 -F77FLAGS      =  -O3 $(NOOPT)
 -CCFLAGS       = -O4
-+F77FLAGS      = $(RPM_OPT_FLAGS) $(NOOPT) -fPIC
-+CCFLAGS       = $(RPM_OPT_FLAGS) -fPIC
++NOOPT         = -fPIC
++F77FLAGS      = $(RPM_OPT_FLAGS) $(NOOPT)
++CCFLAGS       = $(RPM_OPT_FLAGS) $(NOOPT)
  SRCFLAG       =
  F77LOADER     = $(F77)
  CCLOADER      = $(CC)
@@ -60,8 +62,8 @@
 +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
+--- scalapack-1.7/SCALAPACK/Makefile.fedora3	2006-03-08 10:55:36.000000000 -0600
++++ scalapack-1.7/SCALAPACK/Makefile	2006-03-08 10:56:39.000000000 -0600
 @@ -49,7 +49,7 @@
  all: lib
  #all: lib exe


Index: scalapack.spec
===================================================================
RCS file: /cvs/extras/rpms/scalapack/FC-3/scalapack.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- scalapack.spec	1 Mar 2006 00:22:49 -0000	1.9
+++ scalapack.spec	8 Mar 2006 16:58:02 -0000	1.10
@@ -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
@@ -49,7 +49,7 @@
 
 %prep
 %setup -q -c -n %{name}-%{version}
-%patch0 -p1
+#%patch0 -p1
 %ifarch x86_64 ppc64 sparc64 ia64
 %patch1 -p1
 %endif
@@ -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 scm-commits mailing list