Add upstream fix for wrapper flag ordering

4 files changed, 82 insertions, 6 deletions

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index 498678662..1394cdb3d 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  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
+
   19 Jan 2010; Justin Bronder <jsbronder@gentoo.org> openmpi-1.4.1.ebuild:
   Move include files into a subdirectory
 
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 20dc5d91d..71a0aa277 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -1,9 +1,10 @@
 AUX eselect.mpi.openmpi 225 RMD160 cf81165864aaad2833f7a8300c20376210a575dd SHA1 8b50b90346b52b831a59ec0abd8e3dbebad2b94e SHA256 df4d363e9fbab74c234b75f426b7f38ef83d16da2b099222c0dde4a2c3ece687
+AUX openmpi-1.4.1-r22513.patch 2460 RMD160 94c6ca7c7d869039e73f1dbd5402ccd0d5949f11 SHA1 a924c63a94546f25a25beb15328ff2ee18c388e8 SHA256 083528f3ccdda8e1654accd5a6d3c79231d7d727cbd1f05293d7850a32503379
 DIST openmpi-1.3.3.tar.bz2 6695647 RMD160 209972fdbf52787ea0482d9b89fad2c1f59e6e87 SHA1 f668feb22ff0a4c4d9b438e4e69a97b08aa73234 SHA256 e1425853282da9237f5b41330207e54da1dc803a2e19a93dacc3eca1d083e422
 DIST openmpi-1.4.1.tar.bz2 6571835 RMD160 c6fd5f0871eb5f963fe58270f5340a2629f5fd68 SHA1 c5107c03a9fc738dfb4f309b470d052becfdde19 SHA256 d4d71d7c670d710d2d283ea60af50d6c315318a4c35ec576bedfd0f3b7b8c218
 DIST openmpi-1.4.tar.bz2 6699638 RMD160 61f7665c69ea019d347b983062a1eee0ae807c9b SHA1 8e98ceae223f52f147d5151779ed1a43f2865a7f SHA256 fa55edef1bd8af256e459d4d9782516c6998b9d4698eda097d5df33ae499858e
 EBUILD openmpi-1.3.3.ebuild 2907 RMD160 28f671b67cb8423c923377d1b1c4596798ecf878 SHA1 a9ab364c1104bd769f50a42186491b6358f88364 SHA256 c2bab10c70f85bdd1b1f029a9a708f360a558fbc58c1fd1858a05a7c3365d68d
-EBUILD openmpi-1.4.1.ebuild 3097 RMD160 0034dfe11daa891f9e70534c261e8f4d8c419ede SHA1 30ac5116957d0d20e95dc57e29590c9b8f158b9c SHA256 8deee3c5d71373253d2c00014f85be08e03d920b3293cae8aecad7261c90db1f
+EBUILD openmpi-1.4.1.ebuild 2996 RMD160 e2d9027c25d614035c894175124542340bdf3671 SHA1 b77bc16233bf970aacbbefe56f2e43aa5282ab37 SHA256 b9db925aca0601039dd2ec6b8071b3dae33409b62d05480942e426932b2360d1
 EBUILD openmpi-1.4.ebuild 2905 RMD160 bca7ff76c9ab92db2a9f475b5b995d25faeac3e6 SHA1 76022fd4c572a52665495ce9850645b65ba8ff19 SHA256 0e9b38ac5f98549468ad981fc70d22506f7112eaa267655c65c91b1a282d3c5a
-MISC ChangeLog 2212 RMD160 550be7f77e8969be87c1d8a218a18264a001f1f2 SHA1 60b879cc3203cd0f2912e77b4870c7770aa508ad SHA256 619a34eaf5c69935b280fa3a5e56337d67d562cc83ac725c87596a424beffc54
+MISC ChangeLog 2370 RMD160 2294304b7354670a871a61012efd4b14aafe9b57 SHA1 b21e406f0b629e01d2b3eb1bec71b80dae37da98 SHA256 d63d268041169c3533983cfc4c7ab3d083d21bbcdd419f98342e459db72c96a5
 MISC metadata.xml 706 RMD160 d497cb759e382f2b07d5233f99f391e5c6f667d3 SHA1 870215f9b18002f5dc24fa742b0e740a8d730e4f SHA256 11a597b8ce26a8293a4b7ad9f0373c0c57ad99425ede80e8136747fab504807e
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 000000000..128443be5
--- /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 58d88461c..18f3d6903 100644
--- a/sys-cluster/openmpi/openmpi-1.4.1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.4.1.ebuild
@@ -60,6 +60,9 @@ 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() {
@@ -69,10 +72,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
 		c="${c}
 			--enable-mpi-threads