Add upstream fix for wrapper flag ordering

(Portage version: 2.2_rc61/cvs/Linux x86_64)

3 files changed, 82 insertions, 6 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/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