From 45dcddf9c35ef4b2fb757cc2f71cced13082c7aa Mon Sep 17 00:00:00 2001 From: Rocco Meli Date: Mon, 3 Feb 2025 15:59:44 +0100 Subject: [PATCH] CP2K: use libxc@7 for master/next release (#48808) --- var/spack/repos/builtin/packages/cp2k/package.py | 4 +++- var/spack/repos/builtin/packages/dla-future/package.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/cp2k/package.py b/var/spack/repos/builtin/packages/cp2k/package.py index 217574d1469..dcb2c06a8cc 100644 --- a/var/spack/repos/builtin/packages/cp2k/package.py +++ b/var/spack/repos/builtin/packages/cp2k/package.py @@ -159,6 +159,7 @@ class Cp2k(MakefilePackage, CMakePackage, CudaPackage, ROCmPackage): ) depends_on("python@3", type="build") + depends_on("pkgconfig", type="build", when="build_system=cmake") depends_on("blas") depends_on("lapack") @@ -196,13 +197,14 @@ class Cp2k(MakefilePackage, CMakePackage, CudaPackage, ROCmPackage): ) with when("+libxc"): - depends_on("pkgconfig", type="build", when="@7.0:") + depends_on("pkgconfig", type="build", when="@7.0: ^libxc@:6") depends_on("libxc@4.0.3:4", when="@7.0:8.1") depends_on("libxc@5.1.3:5.1", when="@8.2:8") depends_on("libxc@5.1.7:5.1", when="@9:2022.2") depends_on("libxc@6.1:", when="@2023.1:") depends_on("libxc@6.2:", when="@2023.2:") depends_on("libxc@:6", when="@:2024.3") + depends_on("libxc@7 build_system=cmake", when="@2025.2:") with when("+spla"): depends_on("spla+cuda+fortran", when="+cuda") diff --git a/var/spack/repos/builtin/packages/dla-future/package.py b/var/spack/repos/builtin/packages/dla-future/package.py index 865eef85a99..8917ed61845 100644 --- a/var/spack/repos/builtin/packages/dla-future/package.py +++ b/var/spack/repos/builtin/packages/dla-future/package.py @@ -73,7 +73,7 @@ class DlaFuture(CMakePackage, CudaPackage, ROCmPackage): generator("ninja") depends_on("cmake@3.22:", type="build") - depends_on("pkgconfig", type="build") + depends_on("pkgconfig", type=("build", "link")) depends_on("doxygen", type="build", when="+doc") depends_on("mpi")