rpms/blacs/FC-3 Bmake.inc, 1.3, 1.4 Bmake.inc.64bit, 1.2, 1.3 blacs.spec, 1.6, 1.7
Tom Callaway (spot)
fedora-extras-commits at redhat.com
Tue Jul 12 19:46:25 UTC 2005
Author: spot
Update of /cvs/extras/rpms/blacs/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11293/FC-3
Modified Files:
Bmake.inc Bmake.inc.64bit blacs.spec
Log Message:
shared lib version of blacs
Index: Bmake.inc
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-3/Bmake.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Bmake.inc 10 May 2005 19:23:54 -0000 1.3
+++ Bmake.inc 12 Jul 2005 19:46:23 -0000 1.4
@@ -38,14 +38,17 @@
# Name and location of the BLACS library. See section 2 for
# details on BLACS debug level (BLACSDBGLVL).
# ----------------------------------------------------------
- BLACSdir = $(BTOPdir)/LIB
- BLACSDBGLVL = 0
- BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a
- BLACSFINITS = $(BLACSdir)/libmpiblacsF77init.so
- BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a
- BLACSCINITS = $(BLACSdir)/libmpiblacsCinit.so
- BLACSLIB = $(BLACSdir)/libmpiblacs.a
- BLACSLIBS = $(BLACSdir)/libmpiblacs.so
+ BLACSdir = $(BTOPdir)/LIB
+ BLACSDBGLVL = 0
+ BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a
+ BLACSFINITS = libmpiblacsF77init.so.1
+ BLACSFINITSL = -lmpiblacsF77init
+ BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a
+ BLACSCINITS = libmpiblacsCinit.so.1
+ BLACSCINITSL = -lmpiblacsCinit
+ BLACSLIB = $(BLACSdir)/libmpiblacs.a
+ BLACSLIBS = libmpiblacs.so.1
+ BLACSLIBSL = -lmpiblacs
# -------------------------------------
# Name and location of the MPI library.
@@ -53,14 +56,14 @@
MPIdir = /usr
MPILIBdir = $(MPIdir)/lib
MPIINCdir = $(MPIdir)/include
- MPILIB = $(MPILIBdir)/libmpi.a
- LAMLIBS = $(MPILIBdir)/liblam.a $(MPILIBdir)/liblamf77mpi.a
- EXTRALIBS = -ldl -lpthread -llam -lmpi -llamf77mpi
+ MPILIB = -lmpi
+ LAMLIBS = -llam -llamf77mpi
+ EXTRALIBS = -ldl -lpthread -lutil
# -------------------------------------
# All libraries required by the tester.
# -------------------------------------
- BTLIBS = $(BLACSFINIT) $(BLACSLIB) $(BLACSFINIT) $(MPILIB) $(LAMLIBS) $(EXTRALIBS)
+ BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) $(MPILIB) $(LAMLIBS) $(EXTRALIBS)
# ----------------------------------------------------------------
# The directory to put the installation help routines' executables
@@ -201,12 +204,12 @@
# macros should be obvious from the names.
#=============================================================================
F77 = g77
- F77NO_OPTFLAGS = $(RPM_OPT_FLAGS) -ff90 -Wno-globals -fno-globals
+ F77NO_OPTFLAGS = $(RPM_OPT_FLAGS) -ff90 -Wno-globals -fno-globals -fPIC
F77FLAGS = $(F77NO_OPTFLAGS) -O
F77LOADER = $(F77)
F77LOADFLAGS =
CC = gcc
- CCFLAGS = $(RPM_OPT_FLAGS)
+ CCFLAGS = $(RPM_OPT_FLAGS) -fPIC
CCLOADER = $(CC)
CCLOADFLAGS =
Index: Bmake.inc.64bit
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-3/Bmake.inc.64bit,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Bmake.inc.64bit 10 May 2005 19:23:54 -0000 1.2
+++ Bmake.inc.64bit 12 Jul 2005 19:46:23 -0000 1.3
@@ -38,14 +38,17 @@
# Name and location of the BLACS library. See section 2 for
# details on BLACS debug level (BLACSDBGLVL).
# ----------------------------------------------------------
- BLACSdir = $(BTOPdir)/LIB
- BLACSDBGLVL = 0
- BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a
- BLACSFINITS = $(BLACSdir)/libmpiblacsF77init.so
- BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a
- BLACSCINITS = $(BLACSdir)/libmpiblacsCinit.so
- BLACSLIB = $(BLACSdir)/libmpiblacs.a
- BLACSLIBS = $(BLACSdir)/libmpiblacs.so
+ BLACSdir = $(BTOPdir)/LIB
+ BLACSDBGLVL = 0
+ BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a
+ BLACSFINITS = libmpiblacsF77init.so.1
+ BLACSFINITSL = -lmpiblacsF77init
+ BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a
+ BLACSCINITS = libmpiblacsCinit.so.1
+ BLACSCINITSL = -lmpiblacsCinit
+ BLACSLIB = $(BLACSdir)/libmpiblacs.a
+ BLACSLIBS = libmpiblacs.so.1
+ BLACSLIBSL = -lmpiblacs
# -------------------------------------
# Name and location of the MPI library.
@@ -53,14 +56,14 @@
MPIdir = /usr
MPILIBdir = $(MPIdir)/lib64
MPIINCdir = $(MPIdir)/include
- MPILIB = $(MPILIBdir)/libmpi.a
- LAMLIBS = $(MPILIBdir)/liblam.a $(MPILIBdir)/liblamf77mpi.a
- EXTRALIBS = -ldl -lpthread -llam -lmpi -llamf77mpi
+ MPILIB = -lmpi
+ LAMLIBS = -llam -llamf77mpi
+ EXTRALIBS = -ldl -lpthread -lutil
# -------------------------------------
# All libraries required by the tester.
# -------------------------------------
- BTLIBS = $(BLACSFINIT) $(BLACSLIB) $(BLACSFINIT) $(MPILIB) $(LAMLIBS) $(EXTRALIBS)
+ BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) $(MPILIB) $(LAMLIBS) $(EXTRALIBS)
# ----------------------------------------------------------------
# The directory to put the installation help routines' executables
@@ -201,12 +204,12 @@
# macros should be obvious from the names.
#=============================================================================
F77 = g77
- F77NO_OPTFLAGS = $(RPM_OPT_FLAGS) -ff90 -Wno-globals -fno-globals
+ F77NO_OPTFLAGS = $(RPM_OPT_FLAGS) -ff90 -Wno-globals -fno-globals -fPIC
F77FLAGS = $(F77NO_OPTFLAGS) -O
F77LOADER = $(F77)
F77LOADFLAGS =
CC = gcc
- CCFLAGS = $(RPM_OPT_FLAGS)
+ CCFLAGS = $(RPM_OPT_FLAGS) -fPIC
CCLOADER = $(CC)
CCLOADFLAGS =
Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-3/blacs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- blacs.spec 13 Jun 2005 04:14:58 -0000 1.6
+++ blacs.spec 12 Jul 2005 19:46:23 -0000 1.7
@@ -1,7 +1,7 @@
Summary: Basic Linear Algebra Communication Subprograms
Name: blacs
Version: 1.1
-Release: 9%{?dist}
+Release: 10%{?dist}
License: Freely distributable
Group: Development/Libraries
URL: http://www.netlib.org/blacs
@@ -16,9 +16,13 @@
Source8: http://www.netlib.org/blacs/lawn94.ps
Source9: Bmake.inc.64bit
BuildRequires: gcc-g77
-BuildRequires: lapack, blas, lam
-Requires: lapack, blas, lam
+# Lam before 7.1.1-5 is missing:
+# -shared library support
+# -fPIC compilation flag
+BuildRequires: lapack, blas, lam >= 7.1.1-5
+Requires: lapack, blas, lam >= 7.1.1-5
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: blacs-shared.patch
%description
The BLACS (Basic Linear Algebra Communication Subprograms) project is
@@ -31,11 +35,20 @@
parallel machine. The BLACS exist in order to make linear algebra
applications both easier to program and more portable.
+%package devel
+Summary: Development libraries for blacs
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+This package contains development libraries for blacs.
+
%prep
%setup -q -c -n %{name}
%setup -q -D -T -a 1 -n %{name}
+%patch0 -p1
cd BLACS/
-%ifarch ppc64 sparc64 x86_64
+%ifarch ppc64 sparc64 x86_64 ia64
cp -f %{SOURCE9} ./Bmake.inc
%else
cp -f %{SOURCE2} .
@@ -44,10 +57,10 @@
%build
cd BLACS/
make mpi
+
cd TESTING/
make
-cd ..
-cd ..
+cd ../..
cp %{SOURCE3} mpi_prop.ps
cp %{SOURCE4} blacs_install.ps
@@ -62,13 +75,18 @@
mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
cd BLACS/LIB
-for f in *.a; do
+for f in *.a *.so*; do
cp -f $f ${RPM_BUILD_ROOT}%{_libdir}/$f
done
cd ../TESTING/EXE
cp -f x*test_MPI-LINUX-0 ${RPM_BUILD_ROOT}%{_bindir}
cd ${RPM_BUILD_ROOT}%{_libdir}
+for i in libmpiblacs libmpiblacsF77init libmpiblacsCinit; do
+ ln -fs $i.so.1.0.0 $i.so.1
+ ln -s $i.so.1.0.0 $i.so
+done
+cd ..
%post -p /sbin/ldconfig
@@ -78,12 +96,22 @@
rm -fr ${RPM_BUILD_ROOT}
%files
-%defattr(-,root,root)
+%defattr(-,root,root,0755)
%doc mpi_prop.ps blacs_install.ps mpiblacs_issues.ps f77blacsqref.ps cblacsqref.ps lawn94.ps
%{_bindir}/x*test_MPI-LINUX-0
-%{_libdir}/libmpiblacs*
+%{_libdir}/libmpiblacs*.so.*
+
+%files devel
+%defattr(-,root,root,0755)
+%{_libdir}/libmpiblacs*.a
+%{_libdir}/libmpiblacs*.so
%changelog
+* Mon Jun 27 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-10
+- split static lib and .so into -devel package
+- fix Bmake files for shared library support
+- build shared libraries
+
* Tue May 10 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-8
- g77 needs some special compile flags, edited Bmake.inc*
More information about the scm-commits
mailing list