[mpich2/f14/master] - Resolve undefined symbols in the mpichcxx library.

[Deji Akingunola]

commit 898423d591cd0db1c517e5d5a2e4bb344aeef028
Author: Deji Akingunola <dakingun at gmail.com>
Date:   Wed Oct 13 10:37:59 2010 -0400

    - Resolve undefined symbols in the mpichcxx library.

 mpich2-fix-mpicxx-und.patch |   33 +++++++++++++++++++++++++++++++++
 mpich2.spec                 |    7 ++++++-
 2 files changed, 39 insertions(+), 1 deletions(-)
---
diff --git a/mpich2-fix-mpicxx-und.patch b/mpich2-fix-mpicxx-und.patch
new file mode 100644
index 0000000..435b4aa
--- /dev/null
+++ b/mpich2-fix-mpicxx-und.patch
@@ -0,0 +1,33 @@
+--- Makefile.in	2010-02-22 17:21:23.000000000 -0500
++++ Makefile.in.new	2010-10-13 09:24:06.778656859 -0400
+@@ -130,6 +130,8 @@
+ 
+ CC              = @CC@
+ CFLAGS          = @CFLAGS@ $(MPICH2_MAKE_CFLAGS)
++CXX             = @CXX@
++CXXFLAGS        = @CXXFLAGS@ $(MPICH2_MAKE_CXXFLAGS)
+ C_COMPILE       = $(CC) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS)
+ # Build the shared library from the shared object files
+ lib/lib${MPILIBNAME}. at SHLIB_EXT@: lib/lib${MPILIBNAME}.la
+@@ -146,7 +148,7 @@
+ 	(cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o lib${MPILIBNAME}f90.la  -rpath $(libdir)  -ldflags "$(LDFLAGS)" $(LIBS))
+ # Build the shared library from the shared object files
+ lib/lib${MPICXXLIBNAME}. at SHLIB_EXT@: lib/lib${MPICXXLIBNAME}.la
+-	(cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o lib${MPICXXLIBNAME}.la  -rpath $(libdir)  -ldflags "$(LDFLAGS)" $(LIBS))
++	(cd lib && $(CREATESHLIB) --mode=link -cc="$(CXX) $(CXXFLAGS)" -clink="$(CXX) $(CXXFLAGS) -shared" -version-info "@ABIVERSION@" -o lib${MPICXXLIBNAME}.la  -rpath $(libdir) -L. -l$(MPILIBNAME) -ldflags "$(LDFLAGS)" $(LIBS))
+ 
+ # --------------------------------------------------------------------------
+ .libstamp0: 
+--- src/util/createshlib.in	2009-08-05 16:32:08.000000000 -0400
++++ src/util/createshlib.in.new	2010-10-13 09:26:49.539261344 -0400
+@@ -98,8 +98,8 @@
+        -dryrun) Show=echo ;;
+        # -cc and -clink allow us to override the commands used to 
+        # build the shared library
+-       -cc=*) CC_SHL=$option ;;
+-       -clink=*) C_LINK_SHL=$option ;;
++       -cc=*) CC_SHL=`echo $arg | sed -e 's/-cc=//'` ;;
++       -clink=*) C_LINK_SHL=`echo $arg | sed -e 's/-clink=//'` ;;
+        -libtype=*) libtype=$option ;;
+        -l*|-L*)
+        dependentLibs="$dependentLibs $arg"
diff --git a/mpich2.spec b/mpich2.spec
index 64f4e96..88f35dc 100644
--- a/mpich2.spec
+++ b/mpich2.spec
@@ -3,13 +3,14 @@
 Summary:	A high-performance implementation of MPI
 Name:		mpich2
 Version:	1.2.1p1
-Release:	9%{?dist}
+Release:	10%{?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-fix-mpicxx-und.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libXt-devel, libuuid-devel
 BuildRequires:	java-devel-openjdk, gcc-gfortran
@@ -94,6 +95,7 @@ Contains documentations, examples and manpages for mpich2
 %prep
 %setup -q
 %patch0 -p0 -b .modu
+%patch1 -p0 -b .und
 
 %build
 # Remove the rpath link options
@@ -247,6 +249,9 @@ fi
 %exclude %{_datadir}/%{name}/examples*/Makefile-%{_arch}
 
 %changelog
+* Wed Oct 13 2010 Deji Akingunola <dakingun at gmail.com> - 1.2.1p1-10
+- Resolve undefined symbols in the mpichcxx library.
+
 * Mon Oct 11 2010 Deji Akingunola <dakingun at gmail.com> - 1.2.1p1-9
 - Set PYTHONPATH in the module file.