rpms/scalapack/devel scalapack-1.7-fedora.patch, 1.8, 1.9 scalapack.spec, 1.22, 1.23 scalapack-1.7-64bitlibs.patch, 1.7, NONE

[Tom Callaway]

Author: spot

Update of /cvs/extras/rpms/scalapack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13087

Modified Files:
	scalapack-1.7-fedora.patch scalapack.spec 
Removed Files:
	scalapack-1.7-64bitlibs.patch 
Log Message:
compile against new blacs, openmpi

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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- scalapack-1.7-fedora.patch	8 Jul 2008 19:05:54 -0000	1.8
+++ scalapack-1.7-fedora.patch	23 Sep 2008 17:59:13 -0000	1.9
@@ -27,14 +27,7 @@
  #
  #  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
+@@ -35,10 +35,10 @@
  #  Will need to comment out these 6 lines if using PVM
  #
  USEMPI        = -DUsingMpiBlacs
@@ -42,7 +35,7 @@
 -BLACSFINIT    = $(BLACSdir)/libmpiblacsF77init-p4.a
 -BLACSCINIT    = $(BLACSdir)/libmpiblacsCinit-p4.a
 -BLACSLIB      = $(BLACSdir)/libmpiblacs-p4.a
-+SMPLIB        = -L/usr/lib/lam/lib -lmpi
++SMPLIB        = 
 +BLACSFINIT    = -lmpiblacsF77init
 +BLACSCINIT    = -lmpiblacsCinit
 +BLACSLIB      = -lmpiblacs
@@ -54,12 +47,13 @@
  #  The fortran and C compilers, loaders, and their flags
  #
 -F77           = g77
-+F77           = gfortran
++F77           = mpif77
  #F77           = /usr/local/pgi/linux86/bin/pgf77
- CC            = gcc
+-CC            = gcc
 -NOOPT         = 
 -F77FLAGS      =  -O3 $(NOOPT)
 -CCFLAGS       = -O4
++CC            = mpicc
 +NOOPT         = -fPIC
 +F77FLAGS      = $(RPM_OPT_FLAGS) $(NOOPT)
 +CCFLAGS       = $(RPM_OPT_FLAGS) $(NOOPT)
@@ -75,7 +69,7 @@
  #
  #  The archiver and the flag(s) to use when building archive (library)
  #  Also the ranlib routine.  If your system has no ranlib, set RANLIB = echo
-@@ -94,9 +94,13 @@
+@@ -94,9 +94,10 @@
  #  The name of the libraries to be created/linked to
  #
  SCALAPACKLIB  = $(home)/libscalapack.a
@@ -86,10 +80,7 @@
 -PBLIBS        = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB)
 -PRLIBS        = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB)
 -RLIBS         = $(SCALAPACKLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB)
-+LAMLIBS       = -L/usr/lib/lam/lib -llam -lmpi -llamf77mpi
-+EXTRALIBS     = -ldl -lpthread -lutil
-+
-+PBLIBS        = $(SCALAPACKSLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS)
-+PRLIBS        = $(SCALAPACKSLIB) $(CBLACSLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS)
-+RLIBS         = $(SCALAPACKSLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS)
++PBLIBS        = $(SCALAPACKSLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB)
++PRLIBS        = $(SCALAPACKSLIB) $(CBLACSLIB) $(SMPLIB)
++RLIBS         = $(SCALAPACKSLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB)
  LIBS          = $(PBLIBS)


Index: scalapack.spec
===================================================================
RCS file: /cvs/extras/rpms/scalapack/devel/scalapack.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- scalapack.spec	8 Jul 2008 19:05:54 -0000	1.22
+++ scalapack.spec	23 Sep 2008 17:59:13 -0000	1.23
@@ -1,18 +1,16 @@
 Summary: A subset of LAPACK routines redesigned for heterogenous computing
 Name: scalapack
 Version: 1.7.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 # This is freely distributable without any restrictions.
 License: Public Domain
 Group: Development/Libraries
 URL: http://www.netlib.org/lapack-dev/
 Source0: http://www.netlib.org/scalapack/scalapack-%{version}.tgz
-BuildRequires: lapack-devel, blas-devel, lam-devel, blacs-devel
+BuildRequires: lapack-devel, blas-devel, openmpi-devel, blacs-devel
 BuildRequires: gcc-gfortran, glibc-devel
-Requires: lapack, blas-devel, lam, blacs-devel
 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 
@@ -51,9 +49,8 @@
 %prep
 %setup -q -c -n %{name}-%{version}
 %patch0 -p1
-%ifarch x86_64 ppc64 sparc64 ia64
-%patch1 -p1 -b .64
-%endif
+cd %{name}-%{version}/
+sed -i 's!BLACSdir      =.*!BLACSdir      = %{_libdir}!' SLmake.inc
 
 %build
 cd %{name}-%{version}
@@ -96,6 +93,10 @@
 %{_libdir}/libscalapack.so
 
 %changelog
+* Tue Sep 23 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.7.5-4
+- incorporate Deji Akingunola's changes (bz 462424)
+- build against openmpi instead of lam
+
 * Tue Jul  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.7.5-3
 - fix compile against new lam paths
 


--- scalapack-1.7-64bitlibs.patch DELETED ---