From 6e4ea3e69aafc875c6c0209c922912540ee83a84 Mon Sep 17 00:00:00 2001 From: Hans Fangohr Date: Thu, 12 Oct 2023 16:19:26 +0200 Subject: [PATCH] reformulate dependencies The old version seems to stun the concretizer (see https://github.com/fangohr/octopus-in-spack/issues/96) --- spack/package.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/spack/package.py b/spack/package.py index 5ce974e..95815a6 100644 --- a/spack/package.py +++ b/spack/package.py @@ -99,7 +99,8 @@ class Octopus(AutotoolsPackage, CudaPackage): depends_on("libvdwxc+mpi", when="+libvdwxc") depends_on("arpack-ng+mpi", when="+arpack") depends_on("elpa+mpi", when="+elpa") - depends_on("netcdf-fortran ^netcdf-c+mpi", when="+netcdf") + depends_on("netcdf-fortran", when="+netcdf") + depends_on("netcdf-c+mpi", when="+netcdf") depends_on("berkeleygw@2.1+mpi", when="+berkeleygw") with when("~mpi"): # list all the serial dependencies @@ -108,7 +109,8 @@ class Octopus(AutotoolsPackage, CudaPackage): depends_on("libvdwxc~mpi", when="+libvdwxc") depends_on("arpack-ng~mpi", when="+arpack") depends_on("elpa~mpi", when="+elpa") - depends_on("netcdf-fortran ^netcdf-c~~mpi", when="+netcdf") + depends_on("netcdf-fortran", when="+netcdf") + depends_on("netcdf-c~~mpi", when="+netcdf") depends_on("berkeleygw@2.1~mpi", when="+berkeleygw") depends_on("etsf-io", when="+etsf-io")