rpms
/
openmpi
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add patch to add needed opal/util/argv.h includes

This commit is contained in:
Orion Poplawski 2015-09-16 13:51:03 -06:00
parent af6fdab855
commit f141dd6456
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
openmpi-opal.patch Normal file
View File

@ -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"

10
openmpi.spec
View File

@ -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