Fix #313045, add missing libs during linking

(Portage version: 2.2_rc67/git/Linux x86_64)
 (Signed Manifest commit)

4 files changed, 48 insertions, 5 deletions

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 8aee9dd94..b21a96807 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mpich2-1.2.1_p1-r2 (05 Aug 2010)
+
+  05 Aug 2010; Justin Bronder <jsbronder@gentoo.org>
+  -mpich2-1.2.1_p1-r1.ebuild, +mpich2-1.2.1_p1-r2.ebuild,
+  +files/mpich2-1.2.1-fix-missing-libs.patch:
+  Fix #313045, add missing libs during linking
+
   05 Aug 2010; Justin Bronder <jsbronder@gentoo.org>
   -mpich2-1.1.1_p1.ebuild, -mpich2-1.2.1.ebuild, -mpich2-1.2.1_p1.ebuild:
   cleanup
diff --git a/sys-cluster/mpich2/Manifest b/sys-cluster/mpich2/Manifest
index be98bee30..f0760437c 100644
--- a/sys-cluster/mpich2/Manifest
+++ b/sys-cluster/mpich2/Manifest
@@ -10,14 +10,15 @@ AUX mpd.conf 48 RMD160 289de9bb40759e3f71229cf47e4d2af83703a85f SHA1 244eee76dbf
 AUX mpich2-1.0.8-gforker-install-alt-fix.patch 621 RMD160 5b9904ae02f1c1098fdfd2dc4717610f89469afd SHA1 a33bcefa87d990a678436ebfac70976069a7f90d SHA256 a79e469b08e0a3f6c17ec7ec7ea01d3a56a553803fefd24f3794237eead36ced
 AUX mpich2-1.0.8-mpdconf-env.patch 5355 RMD160 26ffada537073676553fdc4a9ee6a02f1a1af279 SHA1 f40eee99425894d9c76c8eefa87b8e72d9b7a02a SHA256 14cbd73be6969569574a880ad23e7c71c4bb02e6994392b2661bf5fb1965ce3d
 AUX mpich2-1.0.8-pkgconfig.patch 928 RMD160 5ce7a800423f250dba0dd69560abebf845e7e556 SHA1 afba6883d1204a4b7c082af7e976186153263d64 SHA256 7f8dcafcb0d138130a684284d9bca86e4834f74a5132f0fef4556391abf43f8e
+AUX mpich2-1.2.1-fix-missing-libs.patch 1825 RMD160 aec1251aa66f0d63c5848920c63339d5558a0f61 SHA1 d70695c63d891a32a98324ffd236f8751465fe98 SHA256 f645d00fc6adeef553517078dcc3313cbabfbf8069ad5a76e2570d183b2d824b
 DIST mpich2-1.2.1p1.tar.gz 18014859 RMD160 810cc486b65e4bcf977ac8d96ccbbcea87e0cbaa SHA1 26bd5620b45bc654aa3945755d11450be63d650c SHA256 a55d1682ee0b5ebbacc047f60620ed291e0a9b3ded3eaeb6a2c81a1598c4c964
-EBUILD mpich2-1.2.1_p1-r1.ebuild 5314 RMD160 f68da81a6bb714273b7efadfc46c2465e55da930 SHA1 9a830a1b6c9529550e9747702513c0f8247b2c9e SHA256 c95be8a760f0aa00ddfdeb5292cee18ad7d9c2ca2139500b49f649397b5bca49
-MISC ChangeLog 2916 RMD160 56277e17e9d6ea7ce60162bfbd53633b7fed2334 SHA1 ebaa627684c1da5ce217370c458af1c4dcc1ff17 SHA256 6e74e3e04997e08556c0e446bdb0846f4b78d6d1449af3285e01843b237a7534
+EBUILD mpich2-1.2.1_p1-r2.ebuild 5397 RMD160 e573844cb7a5fde6a76e27d2f74cff79cbcec19a SHA1 84df6a361115ed8e00ae994392e86cc893fc623f SHA256 4ff01b395ccfc6f3a09f24a4aa5cdcf2a53d9d541367d8c0c68e89d8cbd4ae5d
+MISC ChangeLog 3156 RMD160 84e6527725452d6dbe18bb48b015c12ae5cb0387 SHA1 0cc43e21bba0e9823e194820b65275c90c843fdd SHA256 7752897db17992fad48d82f21f7561a2ca88b7f4a3664b9acc3e2d83cb3e5367
 MISC metadata.xml 607 RMD160 135a7788ce8c8b0434be793aea5a41e081b09630 SHA1 9b9f3342ad6d29a77321c663fa56f9944b30ce29 SHA256 149f73e9eec49b3125b6ac791958206043f3ec278e608279e6f28cccd3a1cc75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkxaMGUACgkQ4MrvBE1wQ8ll5wCfWD7KK/CnNWNhW2v2mqU4bWVp
-YuQAniZqtvJc8QjkJIVQPYQtlTbPE8BW
-=+qEm
+iEYEARECAAYFAkxaNFIACgkQ4MrvBE1wQ8lMjQCfe7BwALZ3H4EhlJdYtXjOSIOZ
+jF0AoIhOBK8JtclTPk2JvWaTuw7pluGE
+=gbn2
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/mpich2/files/mpich2-1.2.1-fix-missing-libs.patch b/sys-cluster/mpich2/files/mpich2-1.2.1-fix-missing-libs.patch
new file mode 100644
index 000000000..1f2ba04cf
--- /dev/null
+++ b/sys-cluster/mpich2/files/mpich2-1.2.1-fix-missing-libs.patch
@@ -0,0 +1,33 @@
+From 94707148dc8c33a1d3245e1f0dd7e28542f91e75 Mon Sep 17 00:00:00 2001
+From: Steve Arnold <nerdboy@gentoo.org>
+Date: Wed, 4 Aug 2010 23:34:06 -0400
+Subject: [PATCH] Added missing library references for the f90 and C++ shared libraries
+
+Backport of upstream r6848.  Directly modifies the Makefile.in to avoid
+having to call simplemake to regenerate the entire build system.
+
+http://trac.mcs.anl.gov/projects/mpich2/changeset/6848
+---
+ Makefile.in |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index cbe4a93..d12babb 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -143,10 +143,10 @@ lib/libf${MPILIBNAME}.@SHLIB_EXT@: lib/libf${MPILIBNAME}.la
+ 	(cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o libf${MPILIBNAME}.la  -rpath $(libdir) -L. -l$(MPILIBNAME) -ldflags "$(LDFLAGS)" $(LIBS))
+ # Build the shared library from the shared object files
+ lib/lib${MPILIBNAME}f90.@SHLIB_EXT@: lib/lib${MPILIBNAME}f90.la
+-	(cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o lib${MPILIBNAME}f90.la  -rpath $(libdir)  -ldflags "$(LDFLAGS)" $(LIBS))
++	(cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o lib${MPILIBNAME}f90.la  -rpath $(libdir) -L. -l$(MPILIBNAME) -ldflags "$(LDFLAGS)" $(LIBS))
+ # Build the shared library from the shared object files
+ lib/lib${MPICXXLIBNAME}.@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 -version-info "@ABIVERSION@" -o lib${MPICXXLIBNAME}.la  -rpath $(libdir) -L. -l$(MPILIBNAME) -ldflags "$(LDFLAGS)" $(LIBS))
+ 
+ # --------------------------------------------------------------------------
+ .libstamp0: 
+-- 
+1.7.1
+
diff --git a/sys-cluster/mpich2/mpich2-1.2.1_p1-r1.ebuild b/sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild
index 520f09992..47958a4d8 100644
--- a/sys-cluster/mpich2/mpich2-1.2.1_p1-r1.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild
@@ -62,6 +62,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/0002-mpd_conf_file-search-order.patch
 	# Upstream trunk, r5845
 	epatch "${FILESDIR}"/0003-Fix-pkgconfig-for-mpich2-ch3-v1.2.1.patch
+	# Upstream trunk, r6848
+	epatch "${FILESDIR}"/mpich2-1.2.1-fix-missing-libs.patch
 
 	# We need f90 to include the directory with mods, and to
 	# fix hardcoded paths for src_test()