[mpich2/f15] Update to 1.4 final

[Deji Akingunola]

commit e6f374c1a8cf653cbb9e65dffd2f318244410043
Author: Deji Akingunola <dakingun at mail.com>
Date:   Mon Jul 4 19:06:40 2011 -0400

    Update to 1.4 final

 mpich2-1.4-embedded-hydra-fix.patch |   64 +++++++++++++++++++++++++++++++++++
 mpich2.spec                         |   19 ++++++++--
 sources                             |    2 +-
 3 files changed, 80 insertions(+), 5 deletions(-)
---
diff --git a/mpich2-1.4-embedded-hydra-fix.patch b/mpich2-1.4-embedded-hydra-fix.patch
new file mode 100644
index 0000000..4703dd7
--- /dev/null
+++ b/mpich2-1.4-embedded-hydra-fix.patch
@@ -0,0 +1,64 @@
+--- src/pm/hydra/configure.in	2011-06-15 15:51:05.000000000 -0400
++++ src/pm/hydra/configure.in.new	2011-07-04 09:35:01.957274795 -0400
+@@ -314,6 +314,10 @@
+ 		if test "$with_plpa_prefix" = "embedded" ; then
+ 		   PAC_CONFIG_SUBDIR_ARGS([tools/bind/plpa/plpa],[--enable-included-mode],
+ 			[have_plpa=yes],[have_plpa=no])
++		   # Only build plpa in embedded mode
++		   if test "$have_plpa" = "yes" ; then
++		      hydra_use_embedded_plpa=yes
++		   fi
+                 else
+                     AC_CHECK_HEADERS([plpa.h])
+                     AC_CHECK_LIB([plpa],[api_probe])
+@@ -334,6 +338,10 @@
+ 		if test "$with_hwloc_prefix" = "embedded" ; then
+ 		   PAC_CONFIG_SUBDIR_ARGS([tools/bind/hwloc/hwloc],[--enable-embedded-mode],
+ 			[have_hwloc=yes],[have_hwloc=no])
++		   # Only build hwloc in embedded mode
++		   if test "$have_hwloc" = "yes" ; then
++		      hydra_use_embedded_hwloc=yes
++		   fi
+                 else
+                     AC_CHECK_HEADERS([hwloc.h])
+                     # hwloc_topology_set_pid was added in hwloc-1.0.0, which is our minimum
+@@ -373,7 +381,9 @@
+    AC_DEFINE(HYDRA_DEFAULT_BINDLIB,NULL,[Default binding library])
+ fi
+ AM_CONDITIONAL([hydra_have_plpa], [test "${have_plpa}" = "yes"])
++AM_CONDITIONAL([hydra_use_embedded_plpa], [test "${hydra_use_embedded_plpa}" = "yes"])
+ AM_CONDITIONAL([hydra_have_hwloc], [test "${have_hwloc}" = "yes"])
++AM_CONDITIONAL([hydra_use_embedded_hwloc], [test "${hydra_use_embedded_hwloc}" = "yes"])
+ 
+ AC_MSG_CHECKING([available process binding libraries])
+ AC_MSG_RESULT([$available_bindlibs])
+--- src/pm/hydra/tools/bind/hwloc/Makefile.mk	2011-04-13 01:28:11.000000000 -0400
++++ src/pm/hydra/tools/bind/hwloc/Makefile.mk.new	2011-07-04 09:37:04.062748268 -0400
+@@ -6,6 +6,7 @@
+ 
+ libhydra_la_SOURCES += $(top_srcdir)/tools/bind/hwloc/bind_hwloc.c
+ 
++if hydra_use_embedded_hwloc
+ AM_CPPFLAGS += -I$(top_srcdir)/tools/bind/hwloc/hwloc/include \
+ 	-I$(top_builddir)/tools/bind/hwloc/hwloc/include
+ 
+@@ -13,3 +14,4 @@
+ external_subdirs += tools/bind/hwloc/hwloc
+ external_ldflags += -L$(top_builddir)/tools/bind/hwloc/hwloc/src
+ external_libs += -lhwloc_embedded
++endif
+--- src/pm/hydra/tools/bind/plpa/Makefile.mk	2011-04-13 01:28:11.000000000 -0400
++++ src/pm/hydra/tools/bind/plpa/Makefile.mk.new	2011-07-04 09:37:56.403093923 -0400
+@@ -6,6 +6,7 @@
+ 
+ libhydra_la_SOURCES += $(top_srcdir)/tools/bind/plpa/bind_plpa.c
+ 
++if hydra_use_embedded_plpa
+ AM_CPPFLAGS += -I$(top_srcdir)/tools/bind/plpa/plpa/src/libplpa \
+ 	-I$(top_builddir)/tools/bind/plpa/plpa/src/libplpa
+ 
+@@ -13,3 +14,4 @@
+ external_subdirs += tools/bind/plpa/plpa
+ external_ldflags += -L$(top_builddir)/tools/bind/plpa/plpa/src/libplpa
+ external_libs += -lplpa_included
++endif
diff --git a/mpich2.spec b/mpich2.spec
index 161cf4f..44e621c 100644
--- a/mpich2.spec
+++ b/mpich2.spec
@@ -3,17 +3,19 @@
 Summary:	A high-performance implementation of MPI
 Name:		mpich2
 Version:	1.4
-Release:	0.1.rc1%{?dist}
+Release:	1%{?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}rc1.tar.gz
+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-1.4-embedded-hydra-fix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libXt-devel, bison, flex, libuuid-devel
 BuildRequires:	java-devel-openjdk, gcc-gfortran, hwloc-devel
 BuildRequires:	perl, python
+BuildRequires:	automake autoconf libtool gettext
 %ifnarch s390 s390x
 BuildRequires:	valgrind-devel
 %endif
@@ -86,6 +88,10 @@ Contains documentations, examples and manpages for mpich2
 %global m_option -m%{__isa_bits}
 %endif
 
+%ifarch %{arm}
+%global m_option ""
+%endif
+
 %ifarch %{ix86} x86_64
 %global selected_channels ch3:nemesis
 %else
@@ -98,13 +104,15 @@ Contains documentations, examples and manpages for mpich2
 %global priority 40
 %endif
 
-%ifarch x86_64 s390
+%ifarch %{ix86} x86_64 s390
 %global XFLAGS -fPIC
 %endif
 
 %prep
-%setup -q -n %{name}-%{version}rc1
+%setup -q
 %patch0 -p0 -b .modu
+%patch1 -p0 -b .ebd
+(cd src/pm/hydra && autoreconf -vif)
 
 %build
 %configure	\
@@ -264,6 +272,9 @@ fi
 %exclude %{_datadir}/%{name}/examples*/Makefile-%{_arch}
 
 %changelog
+* Fri Jun 17 2011 Deji Akingunola <dakingun at gmail.com> - 1.4-1
+- Update to 1.4 final
+
 * Tue Mar 29 2011 Deji Akingunola <dakingun at gmail.com> - 1.4-0.1.rc1
 - Update to 1.4rc1
 
diff --git a/sources b/sources
index da41e78..9cdb9e9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b3aab7156ed3d4afa50ac175cd182e1b  mpich2-1.4rc1.tar.gz
+cf7f8c12161b0af3f111e33c6d15f5c6  mpich2-1.4.tar.gz