rpms/mpich2/F-12 mpich2-mpdboot_hang_fix.patch, NONE, 1.1 mpich2.spec, 1.15, 1.16

[Deji Akingunola]

Author: deji

Update of /cvs/pkgs/rpms/mpich2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4411

Modified Files:
	mpich2.spec 
Added Files:
	mpich2-mpdboot_hang_fix.patch 
Log Message:
* Mon Feb 08 2010 Deji Akingunola <dakingun at gmail.com> - 1.2.1-5
- Properly remove the lib*mpich2*.a files
- Backport the upstream fix for mpdboot hangs.
- add the m_option macro to replace hardcoding -m{__isa_bits}
  and define it correctly for s390, where __isa_bits is 32, but
  the option to pass to gcc et all is -m31. (Jay Fenlason )
- Remove the *.a libs that have the shared version
- Place the rpm macro in the -devel subpackage


mpich2-mpdboot_hang_fix.patch:
 mpd.py |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE mpich2-mpdboot_hang_fix.patch ---
--- src/pm/mpd/mpd.py	2009-11-05 22:34:18.000000000 -0500
+++ src/pm/mpd/mpd.py.new	2010-02-08 09:51:18.037224158 -0500
@@ -196,7 +196,11 @@
         if vinfo:
             print "mpd: your python version must be >= 2.2 ; current version is:", vinfo
             sys.exit(-1)
+
+        # need to close both object and underlying fd (ticket #963)
         sys.stdin.close()
+        os.close(0)
+
         if self.parmdb['MPD_ECHO_PORT_FLAG']:    # do this before becoming a daemon
             # print self.parmdb['MPD_LISTEN_PORT']
             print "mpd_port=%d" % self.parmdb['MPD_LISTEN_PORT']


Index: mpich2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/F-12/mpich2.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- mpich2.spec	26 Nov 2009 23:50:34 -0000	1.15
+++ mpich2.spec	8 Feb 2010 15:21:43 -0000	1.16
@@ -1,13 +1,14 @@
 Summary:	A high-performance implementation of MPI
 Name:		mpich2
 Version:	1.2.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	MIT
 Group:		Development/Libraries
 URL:		http://www.mcs.anl.gov/research/projects/mpich2
 Source0:	http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/%{version}/%{name}-%{version}.tar.gz
 Source1:	mpich2.macros	
 Patch0:		mpich2-modules.patch
+Patch1:		mpich2-mpdboot_hang_fix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libXt-devel, libuuid-devel
 BuildRequires:	java-devel-openjdk, gcc-gfortran
@@ -70,6 +71,12 @@ Contains documentations, examples and ma
 #%{!?opt_fc_fflags: %global opt_fc_fflags %{optflags} -I%{_fmoddir}}
 %{!?opt_f77_fflags: %global opt_f77_fflags %{optflags}}
 
+%ifarch s390
+%global m_option -m31
+%else
+%global m_option -m%{__isa_bits}
+%endif
+
 %ifarch %{ix86} x86_64
 %global selected_channels ch3:nemesis
 %else
@@ -89,6 +96,7 @@ Contains documentations, examples and ma
 %prep
 %setup -q
 %patch0 -p0 -b .modu
+%patch1 -p0 -b .fix
 
 %build
 %configure	\
@@ -105,20 +113,20 @@ Contains documentations, examples and ma
 	--with-java=%{_sysconfdir}/alternatives/java_sdk	\
 	F90=%{opt_fc}						\
 	F77=%{opt_f77}						\
-	CFLAGS="-m%{__isa_bits} -O2 %{?XFLAGS}"			\
-	CXXFLAGS="-m%{__isa_bits} -O2 %{?XFLAGS}"		\
-	F90FLAGS="-m%{__isa_bits} -O2 %{?XFLAGS}"		\
-	FFLAGS="-m%{__isa_bits} -O2 %{?XFLAGS}"			\
+	CFLAGS="%{m_option} -O2 %{?XFLAGS}"			\
+	CXXFLAGS="%{m_option} -O2 %{?XFLAGS}"			\
+	F90FLAGS="%{m_option} -O2 %{?XFLAGS}"			\
+	FFLAGS="%{m_option} -O2 %{?XFLAGS}"			\
 	LDFLAGS='-Wl,-z,noexecstack'				\
 	MPICH2LIB_CFLAGS="%{?opt_cc_cflags}"			\
 	MPICH2LIB_CXXFLAGS="%{optflags}"			\
 	MPICH2LIB_F90FLAGS="%{?opt_fc_fflags}"			\
 	MPICH2LIB_FFLAGS="%{?opt_f77_fflags}"	
 #	MPICH2LIB_LDFLAGS='-Wl,-z,noexecstack'			\
-#	MPICH2_MPICC_FLAGS="-m%{__isa_bits} -O2 %{?XFLAGS}"	\
-#	MPICH2_MPICXX_FLAGS="-m%{__isa_bits} -O2 %{?XFLAGS}"	\
-#	MPICH2_MPIF90_FLAGS="-m%{__isa_bits} -O2 %{?XFLAGS}"	\
-#	MPICH2_MPIF77_FLAGS="-m%{__isa_bits} -O2 %{?XFLAGS}"
+#	MPICH2_MPICC_FLAGS="%{m_option} -O2 %{?XFLAGS}"	\
+#	MPICH2_MPICXX_FLAGS="%{m_option} -O2 %{?XFLAGS}"	\
+#	MPICH2_MPIF90_FLAGS="%{m_option} -O2 %{?XFLAGS}"	\
+#	MPICH2_MPIF77_FLAGS="%{m_option} -O2 %{?XFLAGS}"
 
 #	F90FLAGS="%{?opt_fc_fflags} -I%{_fmoddir}/%{name} %{?XFLAGS}"	\
 #make %{?_smp_mflags} doesn't work
@@ -181,7 +189,7 @@ done
 rm -rf %{buildroot}%{_sbindir}/mpe*
 
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
-
+rm -f %{buildroot}%{_libdir}/%{name}/lib/lib*mpich*.a
 
 %clean
 rm -rf %{buildroot}
@@ -277,7 +285,6 @@ fi
 %{_libdir}/%{name}/bin/mpirun
 %{_libdir}/%{name}/bin/mpich2version
 %config %{_sysconfdir}/%{name}-%{_arch}/
-%config %{_sysconfdir}/rpm/macros.%{name}
 %dir %{_mandir}/%{name}
 %doc %{_mandir}/%{name}/man1/
 %{_datadir}/Modules/modulefiles/%{name}-%{_arch}
@@ -309,6 +316,7 @@ fi
 %{_libdir}/%{name}/lib/trace_rlog/libTraceInput.so
 %{_libdir}/pkgconfig/%{name}-ch3.pc
 %{_datadir}/%{name}/examples*/Makefile-%{_arch}
+%config %{_sysconfdir}/rpm/macros.%{name}
 
 %files doc
 %defattr(-,root,root,-)
@@ -321,6 +329,15 @@ fi
 %exclude %{_datadir}/%{name}/examples*/Makefile-%{_arch}
 
 %changelog
+* Mon Feb 08 2010 Deji Akingunola <dakingun at gmail.com> - 1.2.1-5
+- Properly remove the lib*mpich2*.a files
+- Backport the upstream fix for mpdboot hangs.
+- add the m_option macro to replace hardcoding -m{__isa_bits}
+  and define it correctly for s390, where __isa_bits is 32, but
+  the option to pass to gcc et all is -m31. (Jay Fenlason )
+- Remove the *.a libs that have the shared version
+- Place the rpm macro in the -devel subpackage
+
 * Thu Nov 26 2009 Deji Akingunola <dakingun at gmail.com> - 1.2.1-2
 - Fix the mpich2.module patch.