summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2023-12-28 20:53:05 -0800
committerGitHub <noreply@github.com>2023-12-28 20:53:05 -0800
commit6420e5ce79c89f4d12d303fd9ebfb45dff3ce23b (patch)
tree8bef7a5451181fdaa5167403452bb7673d84135e
parenta1e86781bda5d5d408aae2448a13513d9b900b18 (diff)
downloadspack-6420e5ce79c89f4d12d303fd9ebfb45dff3ce23b.tar.gz
spack-6420e5ce79c89f4d12d303fd9ebfb45dff3ce23b.tar.bz2
spack-6420e5ce79c89f4d12d303fd9ebfb45dff3ce23b.tar.xz
spack-6420e5ce79c89f4d12d303fd9ebfb45dff3ce23b.zip
papi: only patch flag issue for 7.1.0 (#41892)
PAPI CI checks a `spack install` of `papi@master`, and the open range here breaks their CI with the fix because the patch is no longer needed (see #26784, #27625 for why it's difficult to avoid this). The patch issue is going to be fixed in PAPI upstream with whatever release is after `7.1.0`, so we can restrict the patch to `7.1.0` and avoid this issue.
-rw-r--r--var/spack/repos/builtin/packages/papi/package.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/papi/package.py b/var/spack/repos/builtin/packages/papi/package.py
index cfe6c5d7d1..c5a488667f 100644
--- a/var/spack/repos/builtin/packages/papi/package.py
+++ b/var/spack/repos/builtin/packages/papi/package.py
@@ -85,7 +85,7 @@ class Papi(AutotoolsPackage, ROCmPackage):
when="@5.4.0:5.6%gcc@8:",
)
# 7.1.0 erroneously adds -ffree-form for all fortran compilers
- patch("sysdetect-free-form-fix.patch", when="@7.1.0:")
+ patch("sysdetect-free-form-fix.patch", when="@7.1.0")
patch("crayftn-fixes.patch", when="@6.0.0:%cce@9:")
patch("intel-oneapi-compiler-fixes.patch", when="@6.0.0:%oneapi")
patch("intel-cray-freeform.patch", when="@7.0.1")