Add patch from upstream to fix default hostfile location wrt #420431 by William Throwe <wtt6@cornell.edu>

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

4 files changed, 44 insertions, 8 deletions

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index f0cafe28a8e8..806310019d2c 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-cluster/openmpi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.106 2012/05/30 12:54:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.107 2012/06/10 06:38:46 xarthisius Exp $
+
+*openmpi-1.6-r1 (10 Jun 2012)
+
+  10 Jun 2012; Kacper Kowalik <xarthisius@gentoo.org>
+  +files/openmpi-1.6-hostfile.patch, +openmpi-1.6-r1.ebuild,
+  -openmpi-1.6.ebuild:
+  Add patch from upstream to fix default hostfile location wrt #420431 by
+  William Throwe <wtt6@cornell.edu>
 
   30 May 2012; Alexis Ballier <aballier@gentoo.org> openmpi-1.6.ebuild:
   keyword ~amd64-fbsd
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index d45606bc1bf3..cb9f709dc9c7 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -1,7 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX openmpi-1.4.1-r22513.patch 2460 RMD160 94c6ca7c7d869039e73f1dbd5402ccd0d5949f11 SHA1 a924c63a94546f25a25beb15328ff2ee18c388e8 SHA256 083528f3ccdda8e1654accd5a6d3c79231d7d727cbd1f05293d7850a32503379
+AUX openmpi-1.6-hostfile.patch 929 RMD160 186e7764c2798291c4de5cf5bd2c5d075ee9c3c2 SHA1 13bd2505d58621e08aca12ef7d1eeb664f0cc5f2 SHA256 4aca97b15207c633aaf70ee3aeadcb3b9034fa49780dafeacdb19cbdc765fe66
 AUX openmpi-r24328.patch 1707 RMD160 4db5f60d692268e1e42ebbc5379cec245b14daa5 SHA1 25a3ac77307b4681e3f917e61ff88daa58dab508 SHA256 3149f47463057e3263a242b2df88b588074f07395d437b585c5ce37f84aadf83
 DIST openmpi-1.4.2.tar.bz2 6630550 RMD160 2c9fbcc8f77e7fa28e2bd062875d484548cc0b79 SHA1 3e85092433d0e399cc7a51c018f9d13562f78b80 SHA256 19129e3d51860ad0a7497ede11563908ba99c76b3a51a4d0b8801f7e2db6cd80
 DIST openmpi-1.4.3.tar.bz2 6626909 RMD160 087532de57244c03941421162caa9e5537b4eba1 SHA1 9d24b6969d73605904855eb32d40d6b07e231932 SHA256 220b72b1c7ee35469ff74b4cfdbec457158ac6894635143a33e9178aa3981015
@@ -14,13 +15,23 @@ EBUILD openmpi-1.4.3.ebuild 2740 RMD160 a6837841e2dadafbc810b87623fc274256c18b32
 EBUILD openmpi-1.4.4.ebuild 2737 RMD160 c63e98d77ab23859f1f5af12c3fec0100aa2f205 SHA1 d90d89fa04917aac3a266734468e87514f5169c4 SHA256 341cec42f196b62edbee8168e7f165c6a4bddbc020cebecf2207e02401b919f3
 EBUILD openmpi-1.5.4-r3.ebuild 3762 RMD160 6b79e99f00949a9bcb952bb984b686409b8a2e99 SHA1 848532e8116c949488349468c045b41545e03acb SHA256 116c57b587d040e76ddfb7ef4fbe3bf3dbb9674e61ec0aff6621a358de8c849d
 EBUILD openmpi-1.5.5.ebuild 5020 RMD160 73bede486263b479a597869689eca1bb3ca637d4 SHA1 14c10604f1f9bf5af49102d582cd8ae94b1f6439 SHA256 1e2e62e926cc10e383133743428c183544468c76c61f5ccd6b90c507a286e19b
-EBUILD openmpi-1.6.ebuild 4988 RMD160 cae629137fd88d02dbf498fd3a6d97d70c37f72d SHA1 890dd31c308f4d25a872484e0a4921b9872d0db3 SHA256 8a645a6ca8d55e4a2987df4104ee80fa47dfe1888a798eed387b56e29c24e157
-MISC ChangeLog 15815 RMD160 db01f09de72eaca1b0cf03b92b49da0c9f92c147 SHA1 e3a09558109028863e11534556839d9086646989 SHA256 72ed7be229e5956e65248004afb79120deb1b56d564b692f745a965adaa8f806
+EBUILD openmpi-1.6-r1.ebuild 5035 RMD160 3ab38d92d5f7a54464f79ff11ce452615dca8f80 SHA1 d88b8d8b162ee58ae0e8be3811e71d7062611ae3 SHA256 d042dbd658c936a428f49a90987bfb59f8f7393832b967377a9651430ecc4094
+MISC ChangeLog 16097 RMD160 382869f6592a63a19c20e51f76464732fdff596d SHA1 6d0b8116ee8eba4ad35ba3a383fe4a0da0d81e75 SHA256 1b8b171c3660fa5ae092813430f1ac23a532f7095ee0193537db4b11709a8a67
 MISC metadata.xml 975 RMD160 f018d88bafb6fff084b8fca9587e7c530c08f738 SHA1 9843ccb5ca4ab77ef4d469b0435bc6d34d684121 SHA256 6013730050494223daac882d90da64f6f72ed76ac850a53cabd95e7d57dda8ed
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/GGJIACgkQvFcC4BYPU0qvlACguxOAkwAn3IDjaNfl9EydnTKe
-OyIAoK4avicvXEElYC28ZLJkQ43qDM9b
-=nrsX
+iQIcBAEBCAAGBQJP1EEAAAoJEF0huFKJUZL5lI4P/1g94jlc7VrWQoPG+2jZ2yBY
+4jWY7PkOpwdJ6JhJklSGhw2nz8Yal0wbKKuhwa8FsagUV2IR5rq1cxU8SOGOxokY
+YUXZq9UFgef3f+j6FZErKBQjWKEGI0wb90QkujlOE7ipO3n2dPEr9eVTDzQbKYWJ
+7PAjcXe3UgUkpHfCzkg+JlJKY40VoyeiC8ZgjqSKzgJzquyDED+Z/Z6yeD/cNb0Z
+tffqdEn0iK622ksGsWjCkstBMR9e/jWPRfJOXSuH8/aR2Gh6iJWl7TRlfhRP+Czh
+xQ762PwbAJN7qNUpR1ybV1lxCIlzcURGgKuK2fpJ8Qo4A3r+6PmcRE7DnCtkHnp1
+Zus8U8NpSObYUWO+2dSMzILyl8jPSPpnuGq7JirwpagMoPe/NQ6oh3lZ9WUJDFP4
+PSatav2rVBIN7liozot/cqryvm2rLIiyCXknwYuYhteD2NcNrJODE6ctjkYOwTWT
+GzRgpD903GaOsYST061J1E2hqPUUBPQTbrztMOGZxRNrzvbjkdQrobwloxzTuzLw
+Txdd7Da5ZeZzSvP8w02HRYB19EA5BJv48aEP9IFzWBQ+OJn5xW2Aax1M86byvUi7
+e6QAgH4oWEKyMqbw4vG0DjQAcBAf9CiEXeMenD53u/HCZBX79sU3rg6HVHZ7Fz/R
+yn94JVRk/tI7M5mzFK3Y
+=H+t7
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/openmpi/files/openmpi-1.6-hostfile.patch b/sys-cluster/openmpi/files/openmpi-1.6-hostfile.patch
new file mode 100644
index 000000000000..880c42926166
--- /dev/null
+++ b/sys-cluster/openmpi/files/openmpi-1.6-hostfile.patch
@@ -0,0 +1,16 @@
+Fix default hostfile location (backported r26440)
+
+https://bugs.gentoo.org/show_bug.cgi?id=420431
+
+Patch by Orion Poplawski <orion AT SPAMFREE cora DOT nwra DOT com>
+--- a/orte/runtime/orte_mca_params.c
++++ b/orte/runtime/orte_mca_params.c
+@@ -225,7 +225,7 @@ int orte_register_params(void)
+                                 false, false, 1000, &orte_timeout_usec_per_proc);
+     
+     /* default hostfile */
+-    asprintf(&orte_default_hostfile, "%s/etc/openmpi-default-hostfile", opal_install_dirs.prefix);
++    asprintf(&orte_default_hostfile, "%s/openmpi-default-hostfile", opal_install_dirs.sysconfdir);
+     mca_base_param_reg_string_name("orte", "default_hostfile",
+                                    "Name of the default hostfile (relative or absolute path, \"none\" to ignore environmental or default MCA param setting)",
+                                    false, false, orte_default_hostfile, &orte_default_hostfile);
diff --git a/sys-cluster/openmpi/openmpi-1.6.ebuild b/sys-cluster/openmpi/openmpi-1.6-r1.ebuild
index cbb8134a848a..34cbdef00ee9 100644
--- a/sys-cluster/openmpi/openmpi-1.6.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.6.ebuild,v 1.2 2012/05/30 12:54:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.6-r1.ebuild,v 1.1 2012/06/10 06:38:46 xarthisius Exp $
 
 EAPI=4
 inherit eutils fortran-2 multilib flag-o-matic toolchain-funcs versionator
@@ -88,6 +88,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-hostfile.patch
 	# Necessary for scalibility, see
 	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
 	if use threads; then