From f0192edf0da6c0a2f8045202b08e3449508a1be5 Mon Sep 17 00:00:00 2001
From: Kelly Thompson <KineticTheory@users.noreply.github.com>
Date: Tue, 6 Sep 2016 07:55:37 -0600
Subject: [PATCH] For OpenMPI v 2+, add a configure option to provide C++
 bindings. (#1730)

+ Starting with version 2.0, OpenMPI no longer provides C++ bindings by default
  (libmpi_cxx.so). Add a configure option to instruct the build to also build
  and install libmpi_cxx.so.
+ This MPI feature is needed by at least one spack package (moab).
---
 var/spack/repos/builtin/packages/moab/package.py    | 2 +-
 var/spack/repos/builtin/packages/openmpi/package.py | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/var/spack/repos/builtin/packages/moab/package.py b/var/spack/repos/builtin/packages/moab/package.py
index 893a543e97..4dfc5432d2 100644
--- a/var/spack/repos/builtin/packages/moab/package.py
+++ b/var/spack/repos/builtin/packages/moab/package.py
@@ -37,7 +37,7 @@ class Moab(Package):
     homepage = "https://bitbucket.org/fathomteam/moab"
     url      = "http://ftp.mcs.anl.gov/pub/fathom/moab-4.6.3.tar.gz"
 
-    version('4.9.1', 'bcb8bee3e58c076c7f31884db119088e')
+    version('4.9.1', '19cc2189fa266181ad9109b18d0b2ab8')
     version('4.9.0', '40695d0a159040683cfa05586ad4a7c2')
     version('4.8.2', '1dddd10f162fce3cfffaedc48f6f467d')
 
diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py
index ca6bd473f1..67bf6f3713 100644
--- a/var/spack/repos/builtin/packages/openmpi/package.py
+++ b/var/spack/repos/builtin/packages/openmpi/package.py
@@ -165,6 +165,10 @@ def install(self, spec, prefix):
                        "--enable-shared",
                        "--enable-static"]
 
+        # for Open-MPI 2.0:, C++ bindings are disabled by default.
+        if self.spec.satisfies('@2.0:'):
+            config_args.extend(['--enable-mpi-cxx'])
+
         if getattr(self, 'config_extra', None) is not None:
             config_args.extend(self.config_extra)
 
-- 
GitLab