summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreugeneswalker <38933153+eugeneswalker@users.noreply.github.com>2022-07-26 14:41:42 -0700
committerGitHub <noreply@github.com>2022-07-26 15:41:42 -0600
commit3b692875d8441a303f924d1597c4dea7a36060a9 (patch)
tree4caff50df12194627e343a914d2fcb5654d37371
parent1319e2d2615015a0f03c56fa467c8f468a5a46db (diff)
downloadspack-3b692875d8441a303f924d1597c4dea7a36060a9.tar.gz
spack-3b692875d8441a303f924d1597c4dea7a36060a9.tar.bz2
spack-3b692875d8441a303f924d1597c4dea7a36060a9.tar.xz
spack-3b692875d8441a303f924d1597c4dea7a36060a9.zip
mpich@4.0.2 %oneapi: patch config.rpath (#31740)
-rw-r--r--var/spack/repos/builtin/packages/mpich/mpich-oneapi-config-rpath.patch30
-rw-r--r--var/spack/repos/builtin/packages/mpich/package.py3
2 files changed, 33 insertions, 0 deletions
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