From 5a985e33ea671b18ea53e1f48e4a33b48355103d Mon Sep 17 00:00:00 2001
From: Jack Morrison <32687739+jack-morrison@users.noreply.github.com>
Date: Fri, 16 Dec 2022 19:59:24 -0500
Subject: Add `--enable-orterun-prefix-by-default` configure option for OpenMPI
 (#34469)

---
 var/spack/repos/builtin/packages/openmpi/package.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py
index 9405951c35..1fda2c23a9 100644
--- a/var/spack/repos/builtin/packages/openmpi/package.py
+++ b/var/spack/repos/builtin/packages/openmpi/package.py
@@ -474,6 +474,11 @@ class Openmpi(AutotoolsPackage, CudaPackage):
     variant("lustre", default=False, description="Lustre filesystem library support")
     variant("romio", default=True, description="Enable ROMIO support")
     variant("rsh", default=True, description="Enable rsh (openssh) process lifecycle management")
+    variant(
+        "orterunprefix",
+        default=False,
+        description="Prefix Open MPI to PATH and LD_LIBRARY_PATH on local and remote hosts",
+    )
     # Adding support to build a debug version of OpenMPI that activates
     # Memchecker, as described here:
     #
@@ -928,6 +933,11 @@ class Openmpi(AutotoolsPackage, CudaPackage):
         if spec.satisfies("~rsh"):
             config_args.append("--enable-mca-no-build=plm-rsh")
 
+        # Useful for ssh-based environments
+        if spec.satisfies("@1.3:"):
+            if spec.satisfies("+orterunprefix"):
+                config_args.append("--enable-orterun-prefix-by-default")
+
         # some scientific packages ignore deprecated/remove symbols. Re-enable
         # them for now, for discussion see
         # https://github.com/open-mpi/ompi/issues/6114#issuecomment-446279495
-- 
cgit v1.2.3-70-g09d2