hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mpich@4.0.2 %oneapi: patch config.rpath (#31740)

Browse source
This commit is contained in:
eugeneswalker 2022-07-26 14:41:42 -07:00 committed by GitHub
parent 1319e2d261
commit 3b692875d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
var/spack/repos/builtin/packages/mpich/mpich-oneapi-config-rpath.patch Normal file
View file

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

3
var/spack/repos/builtin/packages/mpich/package.py
View file

@ -140,6 +140,9 @@ class Mpich(AutotoolsPackage, CudaPackage, ROCmPackage):
'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