Add upstream fix for wrapper flag ordering

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

4 files changed, 88 insertions, 11 deletions

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index 2742ba09bd90..6ec2192aecd6 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/openmpi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.59 2010/01/20 02:30:42 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.60 2010/02/03 23:18:49 jsbronder Exp $
+
+  03 Feb 2010; Justin Bronder <jsbronder@gentoo.org> openmpi-1.4.1.ebuild,
+  +files/openmpi-1.4.1-r22513.patch:
+  Add upstream fix for wrapper flag ordering
 
   20 Jan 2010; Justin Bronder <jsbronder@gentoo.org>
   -openmpi-1.2.9-r1.ebuild, -openmpi-1.3.3.ebuild, -openmpi-1.4.ebuild:
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 401a29c785c2..d000631d08b5 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX openmpi-1.4.1-r22513.patch 2460 RMD160 94c6ca7c7d869039e73f1dbd5402ccd0d5949f11 SHA1 a924c63a94546f25a25beb15328ff2ee18c388e8 SHA256 083528f3ccdda8e1654accd5a6d3c79231d7d727cbd1f05293d7850a32503379
 DIST openmpi-1.2.9.tar.bz2 3562494 RMD160 072d9a646345e6438e7b4559e06a210fbc06cae6 SHA1 b383e47799b2c615daa32029b98bb2ca6fe09be2 SHA256 0eb36abe09ba7bf6f7a70255974e5d0a273f7f32d0e23419862c6dcc986f1dff
 DIST openmpi-1.4.1.tar.bz2 6571835 RMD160 c6fd5f0871eb5f963fe58270f5340a2629f5fd68 SHA1 c5107c03a9fc738dfb4f309b470d052becfdde19 SHA256 d4d71d7c670d710d2d283ea60af50d6c315318a4c35ec576bedfd0f3b7b8c218
 EBUILD openmpi-1.2.9.ebuild 2823 RMD160 1b05caedb585b52458228863800e0241f39974eb SHA1 733fcb75b95420ffee67198e9c4f1b98d869bfed SHA256 88858dbb7733f3b62a5d2a3888372518ec6dd5a5d691df4f85b01b7841841835
-EBUILD openmpi-1.4.1.ebuild 3031 RMD160 7830809a520d60eddddad3b45ff1761eb700a733 SHA1 181f870a28f0dec065ae1cde8b440b9183c2009c SHA256 5b45b7462e35180c5cb1fba001a43e27fc1ae80cedb63448391ffa1035fc2f13
-MISC ChangeLog 9530 RMD160 6fdaddd24fe49c5c8ec84bd8bb802a1dfb2c751d SHA1 d494e9169c176d95d5e6edffdf806fa76c93fb7e SHA256 b37611425c29732517dfeeb07880fcaff0211a1010e0ef7c69acb3650c05beab
+EBUILD openmpi-1.4.1.ebuild 2932 RMD160 e26adbc8d15fbf3294ba888c2eacaeb4708d2ba1 SHA1 f54a13a8f60b859674875663c070461500cd1c46 SHA256 c6b4d54d3a2462c3c2eea3b242f052a3a46e1ec7ff92768ba2761fcc5c5cd907
+MISC ChangeLog 9688 RMD160 51daaaf88ffdf51777ebc12f4ac1252b66c66c1f SHA1 ef6a239fa72a881c797ddbcdfd3f1f84ab7489e3 SHA256 7847136dba4d19cc5541cc71ead8df950bc9c86c1442029fa5661d70a38094cc
 MISC metadata.xml 600 RMD160 b60367dc458961c4d9ba4b4b548e31298e5aa6bf SHA1 11cdf219d236e2b6ce89b026f2ca8e0829de6758 SHA256 63dc7d01a07d5f1d2c9541075a52e62f12b36d7cf2d6510e38cb2bc5d539b055
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAktWatgACgkQ4MrvBE1wQ8n/ngCggQV6atWAVIGyjrbeZMFr9cbI
-KEYAoJuHiQdlNE7m1HOT96eBS+nIqP8e
-=9Caz
+iEYEARECAAYFAktqBF4ACgkQ4MrvBE1wQ8kV2ACeMFkN8U4FoJpdiWCoM5XQHh3Z
+Bi0An14brWOnjFv2u0u6ZL0DyfQmziaD
+=rR1G
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/openmpi/files/openmpi-1.4.1-r22513.patch b/sys-cluster/openmpi/files/openmpi-1.4.1-r22513.patch
new file mode 100644
index 000000000000..128443be5f9d
--- /dev/null
+++ b/sys-cluster/openmpi/files/openmpi-1.4.1-r22513.patch
@@ -0,0 +1,72 @@
+From 9657a0fc671dd0987b6954932a08b680c35f480f Mon Sep 17 00:00:00 2001
+From: Justin Bronder <jsbronder@gmail.com>
+Date: Wed, 3 Feb 2010 17:13:13 -0500
+Subject: [PATCH] Backport r22513
+
+Per #2201, move the user arguments up to be the first set of argv
+after the compiler argv tokens.
+
+Not closing #2201 yet; there's still discussion on that ticket about
+whether we want to do more or not.
+
+Refs #2201
+cmr:v1.4.2
+cmr:v1.5
+
+Author: jsquyres
+---
+ ompi/tools/wrappers/ompi_wrapper_script.in |    4 +++-
+ opal/tools/wrappers/opal_wrapper.c         |    9 +++++----
+ 2 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/ompi/tools/wrappers/ompi_wrapper_script.in b/ompi/tools/wrappers/ompi_wrapper_script.in
+index 24726ad..87fd8a5 100644
+--- a/ompi/tools/wrappers/ompi_wrapper_script.in
++++ b/ompi/tools/wrappers/ompi_wrapper_script.in
+@@ -140,13 +140,15 @@ my @exec_argv = ();
+ 
+ # assemble command
+ push(@exec_argv, split(' ', $comp));
++# Per https://svn.open-mpi.org/trac/ompi/ticket/2201, add all the user
++# arguments before anything else.
++push(@exec_argv, @appargs);
+ if ($want_preproc == 1) {
+     push(@exec_argv, split(' ', $preproc_flags));
+ }
+ if ($want_compile == 1) {
+     push(@exec_argv, split(' ', $comp_flags));
+ }
+-push(@exec_argv, @appargs);
+ if ($want_link == 1) {
+     push(@exec_argv, split(' ', $linker_flags));
+     push(@exec_argv, split(' ', $libs));
+diff --git a/opal/tools/wrappers/opal_wrapper.c b/opal/tools/wrappers/opal_wrapper.c
+index 86ece5b..1b80f53 100644
+--- a/opal/tools/wrappers/opal_wrapper.c
++++ b/opal/tools/wrappers/opal_wrapper.c
+@@ -712,6 +712,11 @@ main(int argc, char *argv[])
+         exec_argc = 0;
+     }
+ 
++    /* Per https://svn.open-mpi.org/trac/ompi/ticket/2201, add all the
++       user arguments before anything else. */
++    opal_argv_insert(&exec_argv, exec_argc, user_argv);
++    exec_argc = opal_argv_count(exec_argv);
++
+     /* preproc flags */
+     if (flags & COMP_WANT_PREPROC) {
+         opal_argv_insert(&exec_argv, exec_argc, options_data[user_data_idx].preproc_flags);
+@@ -732,10 +737,6 @@ main(int argc, char *argv[])
+         exec_argc = opal_argv_count(exec_argv);
+     }
+ 
+-    /* add all the user arguments */
+-    opal_argv_insert(&exec_argv, exec_argc, user_argv);
+-    exec_argc = opal_argv_count(exec_argv);
+-
+     /* link flags and libs */
+     if (flags & COMP_WANT_LINK) {
+         opal_argv_insert(&exec_argv, exec_argc, options_data[user_data_idx].link_flags);
+-- 
+1.6.4.4
+
diff --git a/sys-cluster/openmpi/openmpi-1.4.1.ebuild b/sys-cluster/openmpi/openmpi-1.4.1.ebuild
index b1aa9b39fc71..971db990c7a5 100644
--- a/sys-cluster/openmpi/openmpi-1.4.1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.4.1.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/openmpi/openmpi-1.4.1.ebuild,v 1.1 2010/01/20 02:24:37 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.4.1.ebuild,v 1.2 2010/02/03 23:18:49 jsbronder Exp $
 
 EAPI=2
 inherit eutils multilib flag-o-matic toolchain-funcs fortran
@@ -57,6 +57,10 @@ src_prepare() {
 		echo 'oob_tcp_listen_mode = listen_thread' \
 			>> opal/etc/openmpi-mca-params.conf
 	fi
+	
+	# https://svn.open-mpi.org/trac/ompi/ticket/2201
+	epatch "${FILESDIR}"/${P}-r22513.patch
+
 }
 
 src_configure() {
@@ -67,10 +71,6 @@ src_configure() {
 		--enable-orterun-prefix-by-default
 		--without-slurm"
 
-	# Workaround for #288147 which also caused packages like hdf5 to fail.
-	# http://www.open-mpi.org/community/lists/users/2009/12/11419.php
-	c="${c} --includedir=$(mpi_root)usr/include/${PN}"
-
 	if use mpi-threads; then
 		myconf="${myconf}
 			--enable-mpi-threads