From e01b9b38ef497b9503c8361547d8f22ae5c69f88 Mon Sep 17 00:00:00 2001 From: Vicente Bolea Date: Wed, 23 Aug 2023 17:44:26 -0400 Subject: adios2: correct c-blosc dependency (#39385) * adios2: correct c-blosc dependency * c-blosc2: disable oneapi spec --- var/spack/repos/builtin/packages/adios2/package.py | 3 ++- var/spack/repos/builtin/packages/c-blosc2/package.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/adios2/package.py b/var/spack/repos/builtin/packages/adios2/package.py index f6a5aba446..b9e7da3d8a 100644 --- a/var/spack/repos/builtin/packages/adios2/package.py +++ b/var/spack/repos/builtin/packages/adios2/package.py @@ -132,7 +132,8 @@ class Adios2(CMakePackage, CudaPackage): depends_on("hdf5+mpi", when="+hdf5+mpi") depends_on("libpressio", when="+libpressio") - depends_on("c-blosc", when="+blosc") + depends_on("c-blosc", when="@:2.8 +blosc") + depends_on("c-blosc2", when="@2.9: +blosc") depends_on("bzip2", when="+bzip2") depends_on("libpng@1.6:", when="+png") depends_on("zfp@0.5.1:0.5", when="+zfp") diff --git a/var/spack/repos/builtin/packages/c-blosc2/package.py b/var/spack/repos/builtin/packages/c-blosc2/package.py index 02e8ed1d2b..f2f73245aa 100644 --- a/var/spack/repos/builtin/packages/c-blosc2/package.py +++ b/var/spack/repos/builtin/packages/c-blosc2/package.py @@ -45,6 +45,8 @@ class CBlosc2(CMakePackage): depends_on("zlib-api", when="+zlib") depends_on("zstd", when="+zstd") + conflicts("%oneapi") + def cmake_args(self): spec = self.spec -- cgit v1.2.3-70-g09d2