rpms/blacs/devel blacs.spec,1.33,1.34
Tom Callaway
spot at fedoraproject.org
Mon Dec 7 20:37:10 UTC 2009
Author: spot
Update of /cvs/pkgs/rpms/blacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1938/devel
Modified Files:
blacs.spec
Log Message:
spec cleanup, static fixes, include files
Index: blacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blacs/devel/blacs.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- blacs.spec 7 Aug 2009 02:41:37 -0000 1.33
+++ blacs.spec 7 Dec 2009 20:37:10 -0000 1.34
@@ -1,32 +1,7 @@
-# These macros will go away soon. Hopefully.
-%global _openmpi_load \
- . /etc/profile.d/modules.sh; \
- module load openmpi-%{_arch}; \
- export CFLAGS="$CFLAGS %{optflags}";
-%global _openmpi_unload \
- . /etc/profile.d/modules.sh; \
- module unload openmpi-%{_arch};
-
-%global _lam_load \
- . /etc/profile.d/modules.sh; \
- module load lam-%{_arch}; \
- export CFLAGS="$CFLAGS %{optflags}";
-%global _lam_unload \
- . /etc/profile.d/modules.sh; \
- module unload lam-%{_arch};
-
-%global _mpich2_load \
- . /etc/profile.d/modules.sh; \
- module load mpich2-%{__isa_bits}; \
- export CFLAGS="$CFLAGS %{optflags}";
-%global _mpich2_unload \
- . /etc/profile.d/modules.sh; \
- module unload mpich2-%{__isa_bits};
-
Summary: Basic Linear Algebra Communication Subprograms
Name: blacs
Version: 1.1
-Release: 33%{?dist}
+Release: 34%{?dist}
License: Public Domain
Group: Development/Libraries
URL: http://www.netlib.org/blacs
@@ -72,41 +47,15 @@ applications both easier to program and
This file contains common files which are not specific to any MPI implementation.
-%package lam
-Summary: BLACS libraries compiled against lam
-Group: Development/Libraries
-BuildRequires: lam-devel
-Requires: %{name}-common = %{version}-%{release}
-Requires: environment-modules
-
-%description lam
-The BLACS (Basic Linear Algebra Communication Subprograms) project is
-an ongoing investigation whose purpose is to create a linear algebra
-oriented message passing interface that may be implemented efficiently
-and uniformly across a large range of distributed memory platforms.
-
-The length of time required to implement efficient distributed memory
-algorithms makes it impractical to rewrite programs for every new
-parallel machine. The BLACS exist in order to make linear algebra
-applications both easier to program and more portable.
-
-This package contains BLACS libraries compiled with lam.
-
-%package lam-devel
-Summary: Development libraries for blacs (lam)
-Group: Development/Libraries
-Requires: %{name}-lam = %{version}-%{release}
-Provides: %{name}-lam-static = %{version}-%{release}
-
-%description lam-devel
-This package contains development libraries for blacs, compiled against lam.
-
%package mpich2
Summary: BLACS libraries compiled against mpich2
Group: Development/Libraries
BuildRequires: mpich2-devel
Requires: %{name}-common = %{version}-%{release}
Requires: environment-modules
+# This is a dirty lie, but something needs to reap these dead subpackages.
+Provides: blacs-lam = %{version}-%{release}
+Obsoletes: blacs-lam < 1.1-33
%description mpich2
The BLACS (Basic Linear Algebra Communication Subprograms) project is
@@ -125,11 +74,21 @@ This package contains BLACS libraries co
Summary: Development libraries for blacs (mpich2)
Group: Development/Libraries
Requires: %{name}-mpich2 = %{version}-%{release}
-Provides: %{name}-mpich2-static = %{version}-%{release}
+Provides: blacs-lam-devel = %{version}-%{release}
+Obsoletes: blacs-lam-devel < 1.1-33
%description mpich2-devel
This package contains development libraries for blacs, compiled against mpich2.
+%package mpich2-static
+Summary: Static libraries for blacs (mpich2)
+Group: Development/Libraries
+Provides: blacs-lam-static = %{version}-%{release}
+Obsoletes: blacs-lam-static < 1.1-33
+
+%description mpich2-static
+This package contains static libraries for blacs, compiled against mpich2.
+
%package openmpi
Summary: BLACS libraries compiled against openmpi
Group: Development/Libraries
@@ -154,15 +113,21 @@ Summary: Development libraries for blacs
Group: Development/Libraries
BuildRequires: openmpi-devel
Requires: %{name}-openmpi = %{version}-%{release}
-Provides: %{name}-openmpi-static = %{version}-%{release}
%description openmpi-devel
This package contains development libraries for blacs, compiled against openmpi.
+%package openmpi-static
+Summary: Static libraries for blacs (openmpi)
+Group: Development/Libraries
+
+%description openmpi-static
+This package contains static libraries for blacs, compiled against openmpi.
+
%prep
%setup -q -c -n %{name}
%patch0 -p1
-for i in lam mpich2 openmpi; do
+for i in mpich2 openmpi; do
cp -a BLACS BLACS-$i
cp -f %{SOURCE1} BLACS-$i/
sed -i "s|FOO|$i|g" BLACS-$i/Bmake.inc
@@ -182,26 +147,19 @@ cp %{SOURCE7} lawn94.ps
# To avoid replicated code define a build macro
%define dobuild() \
-cd BLACS-$MPI_COMPILER; \
+cd BLACS-$MPI_COMPILER_NAME; \
make mpi ; \
cd ..
-# Build LAM version
-export MPI_COMPILER=lam
-%{_lam_load}
-RPM_OPT_FLAGS=`echo $CFLAGS`
-%dobuild
-%{_lam_unload}
-
# Build mpich2 version
-export MPI_COMPILER=mpich2
+export MPI_COMPILER_NAME=mpich2
%{_mpich2_load}
RPM_OPT_FLAGS=`echo $CFLAGS`
%dobuild
%{_mpich2_unload}
# Build OpenMPI version
-export MPI_COMPILER=openmpi
+export MPI_COMPILER_NAME=openmpi
%{_openmpi_load}
RPM_OPT_FLAGS=`echo $CFLAGS`
%dobuild
@@ -214,13 +172,15 @@ RPM_OPT_FLAGS=`echo $CFLAGS`
%install
# mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
-for i in lam mpich2 openmpi; do
+for i in mpich2 openmpi; do
mkdir -p %{buildroot}%{_libdir}/blacs-$i/
+ mkdir -p %{buildroot}%{_includedir}/blacs-$i/
pushd BLACS-$i/LIB
for f in *.a *.so*; do
cp -f $f %{buildroot}%{_libdir}/blacs-$i/$f
done
popd
+ install -p BLACS-$i/SRC/MPI/Bdef.h %{buildroot}%{_includedir}/blacs-$i/
pushd %{buildroot}%{_libdir}/blacs-$i/
for l in libmpiblacs libmpiblacsF77init libmpiblacsCinit; do
ln -fs $l.so.1.0.0 $l.so.1
@@ -250,17 +210,6 @@ rm -fr ${RPM_BUILD_ROOT}
%doc mpi_prop.ps blacs_install.ps mpiblacs_issues.ps f77blacsqref.ps cblacsqref.ps lawn94.ps
# %{_bindir}/x*test_MPI-LINUX-0
-%files lam
-%defattr(-,root,root,0755)
-%dir %{_libdir}/blacs-lam/
-%{_datadir}/Modules/modulefiles/blacs-lam-%{_arch}
-%{_libdir}/blacs-lam/*.so.*
-
-%files lam-devel
-%defattr(-,root,root,0755)
-%{_libdir}/blacs-lam/*.a
-%{_libdir}/blacs-lam/*.so
-
%files mpich2
%defattr(-,root,root,0755)
%dir %{_libdir}/blacs-mpich2/
@@ -269,9 +218,13 @@ rm -fr ${RPM_BUILD_ROOT}
%files mpich2-devel
%defattr(-,root,root,0755)
-%{_libdir}/blacs-mpich2/*.a
+%{_includedir}/blacs-mpich2/
%{_libdir}/blacs-mpich2/*.so
+%files mpich2-static
+%defattr(-,root,root,0755)
+%{_libdir}/blacs-mpich2/*.a
+
%files openmpi
%defattr(-,root,root,0755)
%dir %{_libdir}/blacs-openmpi/
@@ -280,10 +233,20 @@ rm -fr ${RPM_BUILD_ROOT}
%files openmpi-devel
%defattr(-,root,root,0755)
-%{_libdir}/blacs-openmpi/*.a
+%{_includedir}/blacs-openmpi/
%{_libdir}/blacs-openmpi/*.so
+%files openmpi-static
+%defattr(-,root,root,0755)
+%{_libdir}/blacs-openmpi/*.a
+
%changelog
+* Mon Dec 7 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1-34
+- drop lam subpackages (fixes FTBFS, 539057)
+- blacs-mpich2-* now Provides/Obsoletes blacs-lam-*, this is a dirty lie, but we need something to do it
+- move static bits to -static subpackages (resolves 545142)
+- package up Bdef.h for other dependent packages to use (resolves 533929, thanks to Deji Akingunola)
+
* Thu Aug 6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1-33
- rework package to handle all supported MPI environments in Fedora
More information about the scm-commits
mailing list