From f141dd6456f10adbd20a093831ab1e0a691fa673 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Wed, 16 Sep 2015 13:51:03 -0600
Subject: [PATCH] Add patch to add needed opal/util/argv.h includes

---
 openmpi-opal.patch | 33 +++++++++++++++++++++++++++++++++
 openmpi.spec       | 10 +++++++++-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 openmpi-opal.patch

diff --git a/openmpi-opal.patch b/openmpi-opal.patch
new file mode 100644
index 0000000..0284798
--- /dev/null
+++ b/openmpi-opal.patch
@@ -0,0 +1,33 @@
+diff -up openmpi-1.10.0/ompi/mca/mtl/ofi/mtl_ofi_component.c.opal openmpi-1.10.0/ompi/mca/mtl/ofi/mtl_ofi_component.c
+--- openmpi-1.10.0/ompi/mca/mtl/ofi/mtl_ofi_component.c.opal	2015-08-22 13:19:46.000000000 -0600
++++ openmpi-1.10.0/ompi/mca/mtl/ofi/mtl_ofi_component.c	2015-09-16 13:20:27.749403522 -0600
+@@ -13,6 +13,7 @@
+  */
+ 
+ #include "mtl_ofi.h"
++#include "opal/util/argv.h"
+ 
+ static int ompi_mtl_ofi_component_open(void);
+ static int ompi_mtl_ofi_component_query(mca_base_module_t **module, int *priority);
+diff -up openmpi-1.10.0/ompi/tools/ompi_info/ompi_info.c.opal openmpi-1.10.0/ompi/tools/ompi_info/ompi_info.c
+--- openmpi-1.10.0/ompi/tools/ompi_info/ompi_info.c.opal	2015-07-16 09:10:59.000000000 -0600
++++ openmpi-1.10.0/ompi/tools/ompi_info/ompi_info.c	2015-09-16 13:24:34.460318311 -0600
+@@ -50,6 +50,7 @@
+ #endif
+ #include "opal/mca/base/base.h"
+ #include "opal/runtime/opal_info_support.h"
++#include "opal/util/argv.h"
+ #include "opal/util/show_help.h"
+ 
+ #if OMPI_RTE_ORTE
+diff -up openmpi-1.10.0/orte/mca/plm/base/plm_base_receive.c.opal openmpi-1.10.0/orte/mca/plm/base/plm_base_receive.c
+--- openmpi-1.10.0/orte/mca/plm/base/plm_base_receive.c.opal	2015-07-16 09:10:59.000000000 -0600
++++ openmpi-1.10.0/orte/mca/plm/base/plm_base_receive.c	2015-09-16 13:25:43.628016451 -0600
+@@ -37,6 +37,7 @@
+ #include "opal/mca/mca.h"
+ #include "opal/dss/dss.h"
+ #include "opal/threads/threads.h"
++#include "opal/util/argv.h"
+ 
+ #include "orte/constants.h"
+ #include "orte/types.h"
diff --git a/openmpi.spec b/openmpi.spec
index f20d7a6..949e6cc 100644
--- a/openmpi.spec
+++ b/openmpi.spec
@@ -22,7 +22,7 @@
 
 Name:			openmpi%{?_cc_name_suffix}
 Version:		1.10.0
-Release:		1%{?dist}
+Release:		2%{?dist}
 Summary:		Open Message Passing Interface
 Group:			Development/Libraries
 License:		BSD, MIT and Romio
@@ -35,6 +35,10 @@ Source2:		openmpi.pth.py2
 Source3:		openmpi.pth.py3
 Source4:		macros.openmpi
 
+# Add needed opal/util/argv.h include
+# https://github.com/open-mpi/ompi-release/pull/584
+Patch0:			openmpi-opal.patch
+
 BuildRequires:		gcc-gfortran
 %ifnarch s390
 BuildRequires:		valgrind-devel
@@ -124,6 +128,7 @@ Contains development wrapper for compiling Java with openmpi.
 
 %prep
 %setup -q -n openmpi-%{version}
+%patch0 -p1 -b .opal
 
 %build
 ./configure --prefix=%{_libdir}/%{name} \
@@ -265,6 +270,9 @@ make check
 
 
 %changelog
+* Wed Sep 16 2015 Orion Poplawski <orion@cora.nwra.com> - 1.10.0-2
+- Add patch to add needed opal/util/argv.h includes
+
 * Tue Sep 15 2015 Orion Poplawski <orion@cora.nwra.com> - 1.10.0-1
 - Update to 1.10.0