rpms/scalapack/devel scalapack-1.7-64bitlibs.patch, NONE, 1.1 scalapack.spec, 1.7, 1.8

[Tom Callaway (spot)]

Author: spot

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

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

64 bit fixes


scalapack-1.7-64bitlibs.patch:

--- NEW FILE scalapack-1.7-64bitlibs.patch ---
--- 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 @@
 #  and the directory where the BLACS libraries are
 #
 BLACSDBGLVL   = 0
-BLACSdir      = /usr/lib
+BLACSdir      = /usr/lib64
 #
 #  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)


Index: scalapack.spec
===================================================================
RCS file: /cvs/extras/rpms/scalapack/devel/scalapack.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- scalapack.spec	15 May 2005 16:59:01 -0000	1.7
+++ scalapack.spec	15 May 2005 18:40:34 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers
 Name: scalapack
 Version: 1.7
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/scalapack/scalapack_home.html
@@ -11,6 +11,7 @@
 Requires: lapack, blas, lam, blacs
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: scalapack-1.7-fedora.patch
+Patch1: scalapack-1.7-64bitlibs.patch
 
 %description
 The ScaLAPACK (or Scalable LAPACK) library includes a subset 
@@ -41,6 +42,9 @@
 %prep
 %setup -q -c -n %{name}-%{version}
 %patch0 -p1
+%ifarch x86_64 ppc64 sparc64 ia64
+%patch1 -p1
+%endif
 
 %build
 cd SCALAPACK
@@ -68,6 +72,9 @@
 %{_libdir}/libscalapack.a
 
 %changelog
+* 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-6
 - remove hardcoded dist tags