rpms/blacs/devel blacs.spec,1.38,1.39

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/blacs/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8421

Modified Files:
	blacs.spec 
Log Message:
* Thu Jul 15 2010 Dan Horák <dan[at]danny.cz> - 1.1-40
- conditionalize openmpi support



Index: blacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blacs/devel/blacs.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- blacs.spec	13 Apr 2010 12:41:31 -0000	1.38
+++ blacs.spec	15 Jul 2010 09:33:51 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 39%{?dist}
+Release: 40%{?dist}
 License: Public Domain
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -18,6 +18,14 @@ BuildRequires: lapack, blas
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: blacs-fedora.patch
 
+%ifarch s390 s390x %{arm}
+  # No OpenMPI support on these arches
+  %bcond_with openmpi
+%else
+  %bcond_without openmpi
+%endif
+
+
 %description
 The BLACS (Basic Linear Algebra Communication Subprograms) project is 
 an ongoing investigation whose purpose is to create a linear algebra 
@@ -82,6 +90,7 @@ Group: Development/Libraries
 %description mpich2-static
 This package contains static libraries for blacs, compiled against mpich2.
 
+%if %{with openmpi}
 %package openmpi
 Summary: BLACS libraries compiled against openmpi
 Group: Development/Libraries
@@ -116,18 +125,22 @@ Group: Development/Libraries
 
 %description openmpi-static
 This package contains static libraries for blacs, compiled against openmpi.
+%endif
 
 %prep
 %setup -q -c -n %{name}
 %patch0 -p1
-for i in mpich2 openmpi; do
+for i in mpich2 %{?with_openmpi:openmpi}
+do
 	cp -ap BLACS BLACS-$i
 	cp -fp %{SOURCE1} BLACS-$i/
 	sed -i "s|FOO|$i|g" BLACS-$i/Bmake.inc
 done
 
+%if %{with openmpi}
 # openmpi doesn't use TRANSCOMM = -DUseMpich
 sed -i "s|-DUseMpich||g" BLACS-openmpi/Bmake.inc
+%endif
 
 # copy in docs:
 cp -p %{SOURCE2} mpi_prop.ps
@@ -154,12 +167,14 @@ RPM_OPT_FLAGS=`echo $CFLAGS`
 %dobuild
 %{_mpich2_unload}
 
+%if %{with openmpi}
 # Build OpenMPI version
 export MPI_COMPILER_NAME=openmpi
 %{_openmpi_load}
 RPM_OPT_FLAGS=`echo $CFLAGS`
 %dobuild
 %{_openmpi_unload}
+%endif
 
 # cd TESTING/
 # make
@@ -168,7 +183,8 @@ RPM_OPT_FLAGS=`echo $CFLAGS`
 %install
 # mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
 
-for i in mpich2 openmpi; do 
+for i in mpich2 %{?with_openmpi:openmpi}
+do 
   mkdir -p %{buildroot}%{_libdir}/$i/lib/
   mkdir -p %{buildroot}%{_includedir}/$i-%{_arch}/
   mkdir -p %{buildroot}%{_includedir}/blacs/
@@ -213,6 +229,7 @@ rm -fr ${RPM_BUILD_ROOT}
 %defattr(-,root,root,0755)
 %{_libdir}/mpich2/lib/*.a
 
+%if %{with openmpi}
 %files openmpi
 %defattr(-,root,root,0755)
 %{_libdir}/openmpi/lib/*.so.*
@@ -225,8 +242,12 @@ rm -fr ${RPM_BUILD_ROOT}
 %files openmpi-static
 %defattr(-,root,root,0755)
 %{_libdir}/openmpi/lib/*.a
+%endif
 
 %changelog
+* Thu Jul 15 2010 Dan Horák <dan[at]danny.cz> - 1.1-40
+- conditionalize openmpi support
+
 * Tue Apr 13 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1-39
 - openmpi doesn't use TRANSCOMM	= -DUseMpich
 - put libraries in $MPI_LIB, not $MPI_HOME