diff options
| author | lukebroskop <luke.roskop@hpe.com> | 2021-05-10 15:16:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-10 13:16:41 -0700 |
| commit | 50eec402324f1188df2a3b2502779d4ee976039c (patch) | |
| tree | 862b08f28b7756c91956f95f1340fd1d7bc63992 /var | |
| parent | 2450ee0fb0974632710cacd87f41c7e0d4ad58ac (diff) | |
| download | spack-50eec402324f1188df2a3b2502779d4ee976039c.tar.gz spack-50eec402324f1188df2a3b2502779d4ee976039c.tar.bz2 spack-50eec402324f1188df2a3b2502779d4ee976039c.tar.xz spack-50eec402324f1188df2a3b2502779d4ee976039c.zip | |
CrayPE fix for otf2 (#23499)
when using Cray's cs-prgenv, allow the build system to detect the systems as an XC
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/otf2/cray_ac_scorep_sys_detection-m4.patch | 11 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/otf2/package.py | 12 |
2 files changed, 23 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/otf2/cray_ac_scorep_sys_detection-m4.patch b/var/spack/repos/builtin/packages/otf2/cray_ac_scorep_sys_detection-m4.patch new file mode 100644 index 0000000000..52ea2428ec --- /dev/null +++ b/var/spack/repos/builtin/packages/otf2/cray_ac_scorep_sys_detection-m4.patch @@ -0,0 +1,11 @@ +--- a/vendor/common/build-config/m4/ac_scorep_sys_detection.m4 2019-07-19 01:31:13.409311556 -0500 ++++ b/vendor/common/build-config/m4/ac_scorep_sys_detection.m4 2021-03-04 22:11:30.278313559 -0600 +@@ -100,6 +100,8 @@ + [test "x${build_cpu}" = "xpowerpc64" && test -d /bgsys], + [ac_scorep_platform="bgp"], + [(test "x${build_cpu}" = "xx86_64" || test "x${build_cpu}" = "xaarch64") && test -d /opt/cray], ++ [AS_IF([test -d /opt/cray/cs-prgenv], ++ [ac_scorep_platform="crayxc"])] + [AS_IF([test -L /opt/cray/pmi/default], + [AS_IF([test "x`readlink -f /opt/cray/pmi/default | grep -o --regexp=[[a-z]]*$ | grep -q ss && echo TRUE`" = "xTRUE"], + [ac_scorep_platform="crayxt"], diff --git a/var/spack/repos/builtin/packages/otf2/package.py b/var/spack/repos/builtin/packages/otf2/package.py index 436a878028..0fed25f920 100644 --- a/var/spack/repos/builtin/packages/otf2/package.py +++ b/var/spack/repos/builtin/packages/otf2/package.py @@ -25,10 +25,22 @@ class Otf2(AutotoolsPackage): version('1.3.1', sha256='c4605ace845d89fb1a19223137b92cc503b01e3db5eda8c9e0715d0cfcf2e4b9') version('1.2.1', sha256='1db9fb0789de4a9c3c96042495e4212a22cb581f734a1593813adaf84f2288e4') + depends_on('autoconf', type='build', when='%cce') + depends_on('automake', type='build', when='%cce') + depends_on('libtool', type='build', when='%cce') + depends_on('m4', type='build', when='%cce') + # Fix missing initialization of variable resulting in issues when used by # APEX/HPX: https://github.com/STEllAR-GROUP/hpx/issues/5239 patch('collective_callbacks.patch', when='@2.1:2.2') + # when using Cray's cs-prgenv, allow the build system to detect the systems as an XC + patch('cray_ac_scorep_sys_detection-m4.patch', when='%cce') + + @property + def force_autoreconf(self): + return self.spec.satisfies('%cce') + def configure_args(self): return [ '--enable-shared', |