From 3b692875d8441a303f924d1597c4dea7a36060a9 Mon Sep 17 00:00:00 2001
From: eugeneswalker <38933153+eugeneswalker@users.noreply.github.com>
Date: Tue, 26 Jul 2022 14:41:42 -0700
Subject: mpich@4.0.2 %oneapi: patch config.rpath (#31740)

---
 .../packages/mpich/mpich-oneapi-config-rpath.patch | 30 ++++++++++++++++++++++
 var/spack/repos/builtin/packages/mpich/package.py  |  3 +++
 2 files changed, 33 insertions(+)
 create mode 100644 var/spack/repos/builtin/packages/mpich/mpich-oneapi-config-rpath.patch

(limited to 'var')

diff --git a/var/spack/repos/builtin/packages/mpich/mpich-oneapi-config-rpath.patch b/var/spack/repos/builtin/packages/mpich/mpich-oneapi-config-rpath.patch
new file mode 100644
index 0000000000..94eafda34f
--- /dev/null
+++ b/var/spack/repos/builtin/packages/mpich/mpich-oneapi-config-rpath.patch
@@ -0,0 +1,30 @@
+diff -ruN spack-src/confdb/config.rpath spack-src-patched/confdb/config.rpath
+--- spack-src/confdb/config.rpath	2022-03-29 15:13:49.000000000 -0700
++++ spack-src-patched/confdb/config.rpath	2022-07-25 17:54:14.638367460 -0700
+@@ -76,7 +76,7 @@
+         ecc*)
+           wl='-Wl,'
+           ;;
+-        icc* | ifort*)
++        icc* | icx* | ifort* | ifx*)
+           wl='-Wl,'
+           ;;
+         lf95*)
+@@ -233,7 +233,7 @@
+           enable_dtags_flag="${wl}--enable-new-dtags"
+           disable_dtags_flag="${wl}--disable-new-dtags"
+         else
+-          case $cc_basename in ifort*)
++          case $cc_basename in ifort* | ifx*)
+             enable_dtags_flag="${wl}--enable-new-dtags"
+             disable_dtags_flag="${wl}--disable-new-dtags"
+             ;;
+@@ -380,7 +380,7 @@
+       ;;
+     darwin* | rhapsody*)
+       hardcode_direct=no
+-      if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then
++      if { case $cc_basename in ifort* | ifx*) true;; *) test "$GCC" = yes;; esac; }; then
+         :
+       else
+         ld_shlibs=no
diff --git a/var/spack/repos/builtin/packages/mpich/package.py b/var/spack/repos/builtin/packages/mpich/package.py
index a66023734a..401e8de967 100644
--- a/var/spack/repos/builtin/packages/mpich/package.py
+++ b/var/spack/repos/builtin/packages/mpich/package.py
@@ -140,6 +140,9 @@ with '-Wl,-commons,use_dylibs' and without
         'mpicc', 'mpicxx', 'mpif77', 'mpif90', 'mpifort', relative_root='bin'
     )
 
+    # https://github.com/spack/spack/issues/31678
+    patch('mpich-oneapi-config-rpath.patch', when='@4.0.2 %oneapi')
+
     # Fix using an external hwloc
     # See https://github.com/pmodels/mpich/issues/4038
     # and https://github.com/pmodels/mpich/pull/3540
-- 
cgit v1.2.3-70-g09d2