From 6162ea95b0e7e7986c929462c4fbbef9b0829d42 Mon Sep 17 00:00:00 2001 From: QuellynSnead Date: Sat, 23 Apr 2022 05:01:13 -0600 Subject: [PATCH] trilinos: limit secas patch range for cce (#30205) The cray_secas.patch no longer appears to be necessary with cce 13.x. Limit its application to cce 12.14.1 - 12.99.99. --- var/spack/repos/builtin/packages/trilinos/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index c57d444217..1e9778063e 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -393,7 +393,7 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage): patch('xlf_tpetra.patch', when='@12.12.1 %' + _compiler) patch('fix_clang_errors_12_18_1.patch', when='@12.18.1%clang') patch('cray_secas_12_12_1.patch', when='@12.12.1%cce') - patch('cray_secas.patch', when='@12.14.1:%cce') + patch('cray_secas.patch', when='@12.14.1:12%cce') # workaround an NVCC bug with c++14 (https://github.com/trilinos/Trilinos/issues/6954) # avoid calling deprecated functions with CUDA-11