Fix #313045, add missing libs during linking

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 57 insertions, 4 deletions

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 0bdba2c559c6..9c10971833ef 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/mpich2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.56 2010/07/08 12:58:23 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.57 2010/08/05 04:03:09 jsbronder Exp $
+
+*mpich2-1.2.1_p1-r1 (05 Aug 2010)
+
+  05 Aug 2010; Justin Bronder <jsbronder@gentoo.org>
+  -mpich2-1.2.1_p1.ebuild, +mpich2-1.2.1_p1-r1.ebuild,
+  +files/mpich2-1.2.1-fix-missing-libs.patch:
+  Fix #313045, add missing libs during linking
 
   08 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   mpich2-1.2.1_p1.ebuild:
diff --git a/sys-cluster/mpich2/Manifest b/sys-cluster/mpich2/Manifest
index c79a24e198ef..e7025be35b2d 100644
--- a/sys-cluster/mpich2/Manifest
+++ b/sys-cluster/mpich2/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0001-MPD_CONF_FILE-should-be-readable.patch 1496 RMD160 33b8db14ab69293a53ecb0192ea7a2a568ee422e SHA1 88cb1d7cc60a1eb7a2a7ea07c8058ebb3318c734 SHA256 747462d1d2272291fd956631cee4170112523027e2b89d4f2abf6d618cc004aa
 AUX 0002-mpd_conf_file-search-order.patch 3882 RMD160 90bf46695398bea605002826c7d9b85c7f07e5e9 SHA1 9f20b59f853e13d81f6227ddb16535d76ec4bab3 SHA256 a56c943e68e0bcf69900ae76cb4df73ef19d60f0e9e16e6d75d48b2651324b33
 AUX 0003-Fix-pkgconfig-for-mpich2-ch3-v1.2.1.patch 1510 RMD160 8bcd0ec310bcbc13bfd3d0200c1b9f5a88fc4677 SHA1 949da42c2fa90c4a298dc37e0994e97317ae75e9 SHA256 84896b8c127a872fac3a99e9acdb41a2a051275399b186b54349a72d478acb00
@@ -8,10 +11,18 @@ AUX mpich2-1.0.8-mpdconf-env.patch 5041 RMD160 c3d9f6ebd43443a24614da030253cf8c5
 AUX mpich2-1.0.8-pkgconfig.patch 928 RMD160 5ce7a800423f250dba0dd69560abebf845e7e556 SHA1 afba6883d1204a4b7c082af7e976186153263d64 SHA256 7f8dcafcb0d138130a684284d9bca86e4834f74a5132f0fef4556391abf43f8e
 AUX mpich2-1.0.8-py26.patch 1341 RMD160 51d9b6ebb1fcce06cabb7ef201ffefcd97e39e3e SHA1 1a7db4a10ef6916f1ab98a38ce3c0de9f1c05725 SHA256 43dfaa60a2822728eae874dc423563aac1e658873702858b5bef237577270331
 AUX mpich2-1.0.8-site-packages-py.patch 7534 RMD160 93b2cab20620da379615eaf3bfc7279384987722 SHA1 706313c20e1d4d6a4a060c8ac36befdb5ee3b926 SHA256 a857e7c0effa7cdd62c1bc1bd054b4746764246410062d373e7e0892bcd20df8
+AUX mpich2-1.2.1-fix-missing-libs.patch 1825 RMD160 aec1251aa66f0d63c5848920c63339d5558a0f61 SHA1 d70695c63d891a32a98324ffd236f8751465fe98 SHA256 f645d00fc6adeef553517078dcc3313cbabfbf8069ad5a76e2570d183b2d824b
 AUX mpich2.envd 45 RMD160 e29a0d617bbc15cc42d3088f8a79c1c715b353fa SHA1 765b885d0e1d65fe7ba845cf72e3e923613d6514 SHA256 d6f128f84e1d015922af42e1280586b84737740b2517cc0b35f498b571f252f9
 DIST mpich2-1.0.8.tar.gz 17237476 RMD160 646cf50fbdc60a49809f4d0a6bcaf2835844db1f SHA1 41d6f6ce1034ecec5c14fb03592730ae2dd071e5 SHA256 7551ce20f3ef366567c566d08782323360b5dbd2d15d816e41c10b5f96eaf369
 DIST mpich2-1.2.1p1.tar.gz 18014859 RMD160 810cc486b65e4bcf977ac8d96ccbbcea87e0cbaa SHA1 26bd5620b45bc654aa3945755d11450be63d650c SHA256 a55d1682ee0b5ebbacc047f60620ed291e0a9b3ded3eaeb6a2c81a1598c4c964
 EBUILD mpich2-1.0.8.ebuild 6043 RMD160 1b3bab7d26b9dbb4bec6c8768384eebbbdd9b1a0 SHA1 6b362515fd2afeff899d3bf42bd639fe2bdddf81 SHA256 0d82f061af8a8247af27107e7dc9e20fa296699c18021ac2a4b182c946ab5cd6
-EBUILD mpich2-1.2.1_p1.ebuild 5002 RMD160 f934307565fd8d5435c1ade4b8edc859c5013f27 SHA1 e756e3017b2efb94998b09dc92d65136b0627959 SHA256 abbe4a3d36003e1ae57c91e03a4ec77ca049a68e63d6fd83afc69bf33f2eafa9
-MISC ChangeLog 11635 RMD160 593c9b12e4194666c90a8e59e0c8c7f8cf90d567 SHA1 c595a903ee5079209aebb568dfa23a17f3290293 SHA256 a59319ab22175d858fffd517803de0f458bde7838726725f7ba1dd7ab3345d2f
+EBUILD mpich2-1.2.1_p1-r1.ebuild 5098 RMD160 0d7feb9250bb145576b148b793b8479dacd48d25 SHA1 a8fcc42ff4f6275243a313b67301a99cf327ad79 SHA256 757d6377d8bcf70529be164e56eefb38809f258ad82bf70b0eae5e267cfcc4cc
+MISC ChangeLog 11873 RMD160 a669d52eee003ff7a7a2409e1985ca0a4546f13d SHA1 ce969498b714c20dfe73ffe08bde0835482aae6e SHA256 6c301694dfddd58aaa84bfcec99e16ca0f2878b9272f6d5204ba07850d1fe654
 MISC metadata.xml 468 RMD160 6fec5dd4e4a66c5feebc8030da722b7c4d94175c SHA1 145b3c5ef34a6f3acdb732e967c53add6bbfe676 SHA256 41ca5abf4645fc4853ca86b63dc92d301c90c93329b5ffdcb255503d389dfe32
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkxaOAIACgkQ4MrvBE1wQ8k7MACfVEpsZACjVXQpnT/gbRV3EOR0
+F00An2mipQmXhsC6CPFlPtSNUBE1ok9l
+=u5UI
+-----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 000000000000..1f2ba04cfe1c
--- /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.ebuild b/sys-cluster/mpich2/mpich2-1.2.1_p1-r1.ebuild
index 6f2b3609572d..3be1a71f8f39 100644
--- a/sys-cluster/mpich2/mpich2-1.2.1_p1.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.2.1_p1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.2.1_p1.ebuild,v 1.5 2010/07/08 12:58:23 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.2.1_p1-r1.ebuild,v 1.1 2010/08/05 04:03:08 jsbronder Exp $
 
 EAPI=2
 PYTHON_DEPEND="2"
@@ -54,6 +54,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  #313045
+	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()