diff options
| author | lukebroskop <luke.roskop@hpe.com> | 2021-09-06 07:38:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-06 14:38:51 +0200 |
| commit | 92e4db468137eb814abaf039da739f481b42d297 (patch) | |
| tree | 0ba986076f35b234aa990357cffe756df69b612e | |
| parent | dd8dc08a9099d23222fc5a4804dc7c2eba8257ae (diff) | |
| download | spack-92e4db468137eb814abaf039da739f481b42d297.tar.gz spack-92e4db468137eb814abaf039da739f481b42d297.tar.bz2 spack-92e4db468137eb814abaf039da739f481b42d297.tar.xz spack-92e4db468137eb814abaf039da739f481b42d297.zip | |
Do not allow cray build system patch for later version of otf2 (#25283)
Co-authored-by: Luke Roskop <lroskop@cedar.head.cm.us.cray.com>
Co-authored-by: Massimiliano Culpo <massimiliano.culpo@gmail.com>
| -rw-r--r-- | var/spack/repos/builtin/packages/otf2/package.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/otf2/package.py b/var/spack/repos/builtin/packages/otf2/package.py index 6079b84a20..7265705a97 100644 --- a/var/spack/repos/builtin/packages/otf2/package.py +++ b/var/spack/repos/builtin/packages/otf2/package.py @@ -25,21 +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') + with when('@2.2 %cce'): + depends_on('autoconf', type='build') + depends_on('automake', type='build') + depends_on('libtool', type='build') + depends_on('m4', type='build') # 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') + patch('cray_ac_scorep_sys_detection-m4.patch', when='@2.2 %cce') @property def force_autoreconf(self): - return self.spec.satisfies('%cce') + return self.spec.satisfies('@2.2 %cce') def configure_args(self): return [ |