From dfa86dce0835469cc8ed88fba594828bd4cf921a Mon Sep 17 00:00:00 2001 From: Richard Berger Date: Wed, 29 Jan 2025 10:07:58 -0700 Subject: [PATCH] petsc: only conflict with kokkos@4.5: if it is enabled (#48698) --- var/spack/repos/builtin/packages/petsc/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index 1cbefc39b13..cd33c1fa336 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -465,8 +465,8 @@ def check_fortran_compiler(self): depends_on("kokkos", when="+kokkos") depends_on("kokkos~complex_align", when="+kokkos+complex") depends_on("kokkos-kernels", when="+kokkos") - conflicts("kokkos@4.5:", when="@:3.22") - conflicts("kokkos-kernels@4.5:", when="@:3.22") + conflicts("kokkos@4.5:", when="@:3.22 +kokkos") + conflicts("kokkos-kernels@4.5:", when="@:3.22 +kokkos") for cuda_arch in CudaPackage.cuda_arch_values: depends_on( "kokkos+cuda+cuda_lambda cuda_arch=%s" % cuda_arch,