rpms/scalapack/FC-3 scalapack-1.7-fedora3.patch, NONE, 1.1 scalapack.spec, 1.3, 1.4 scalapack-1.7-fedora.patch, 1.2, NONE

[Tom Callaway (spot)]

Author: spot

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

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

Fix broken FC-3 patch.


scalapack-1.7-fedora3.patch:

--- NEW FILE scalapack-1.7-fedora3.patch ---
--- 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
@@ -19,7 +19,7 @@
 #  The complete path to the top level of ScaLAPACK directory, usually
 #  $(HOME)/SCALAPACK
 #
-home          = $(HOME)/SCALAPACK
+home          = $(RPM_BUILD_DIR)/scalapack-1.7/SCALAPACK
 #
 #  The platform identifier to suffix to the end of library names
 #
@@ -29,16 +29,16 @@
 #  and the directory where the BLACS libraries are
 #
 BLACSDBGLVL   = 0
-BLACSdir      = /usr/local/lib
+BLACSdir      = /usr/lib
 #
 #  MPI setup; tailor to your system if using MPIBLACS
 #  Will need to comment out these 6 lines if using PVM
 #
 USEMPI        = -DUsingMpiBlacs
-SMPLIB        = /usr/local/mpich-1.2.1/lib/libmpich.a
-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
 TESTINGdir    = $(home)/TESTING
 
 #
@@ -71,8 +71,8 @@
 #F77           = /usr/local/pgi/linux86/bin/pgf77
 CC            = gcc
 NOOPT         = 
-F77FLAGS      =  -O3 $(NOOPT)
-CCFLAGS       = -O4
+F77FLAGS      = $(RPM_OPT_FLAGS) $(NOOPT)
+CCFLAGS       = $(RPM_OPT_FLAGS)
 SRCFLAG       =
 F77LOADER     = $(F77)
 CCLOADER      = $(CC)
@@ -94,9 +94,12 @@
 #  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
 #
-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
+
+PBLIBS        = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS)
+PRLIBS        = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS)
+RLIBS         = $(SCALAPACKLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS)
 LIBS          = $(PBLIBS)


Index: scalapack.spec
===================================================================
RCS file: /cvs/extras/rpms/scalapack/FC-3/scalapack.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scalapack.spec	25 Apr 2005 00:38:23 -0000	1.3
+++ scalapack.spec	9 May 2005 03:40:40 -0000	1.4
@@ -4,7 +4,7 @@
 Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers
 Name: scalapack
 Version: 1.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/scalapack/scalapack_home.html
@@ -13,7 +13,7 @@
 BuildRequires: gcc-g77
 Requires: lapack, blas, lam, blacs
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0: scalapack-1.7-fedora.patch
+Patch0: scalapack-1.7-fedora3.patch
 
 %description
 The ScaLAPACK (or Scalable LAPACK) library includes a subset 
@@ -71,6 +71,9 @@
 %{_libdir}/libscalapack.a
 
 %changelog
+* Sun May  8 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.7-4
+- fix broken patch for fc-3 branch
+
 * Sun Apr 24 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.7-3
 - use dist tag
 - fix fc3 BuildRequires


--- scalapack-1.7-fedora.patch DELETED ---