diff --git a/share/spack/gitlab/cloud_pipelines/stacks/hep/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/hep/spack.yaml index 6c6b6d91295..40d8bd81f4f 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/hep/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/hep/spack.yaml @@ -27,7 +27,7 @@ spack: rivet: require: hepmc=3 root: - require: +arrow +davix +dcache +emacs +examples +fftw +fits +fortran +gdml +graphviz +gsl +http +math +minuit +mlp +mysql +opengl +postgres +pythia8 +python +r +roofit +root7 +rpath ~shadow +spectrum +sqlite +ssl +tbb +threads +tmva +tmva-cpu +unuran +vc +vdt +veccore +webgui +x +xml +xrootd # cxxstd=20 + require: +arrow ~daos +davix +dcache +emacs +examples +fftw +fits +fortran +gdml +graphviz +gsl +http +math +minuit +mlp +mysql +opengl +postgres +pythia8 +python +r +roofit +root7 +rpath ~shadow +spectrum +sqlite +ssl +tbb +threads +tmva +tmva-cpu +unuran +vc +vdt +veccore +webgui +x +xml +xrootd # cxxstd=20 # note: root cxxstd=20 not concretizable within sherpa vecgeom: require: +gdml +geant4 +root +shared cxxstd=20 diff --git a/var/spack/repos/builtin/packages/daos/package.py b/var/spack/repos/builtin/packages/daos/package.py index 341f2e442f5..0257af8e642 100644 --- a/var/spack/repos/builtin/packages/daos/package.py +++ b/var/spack/repos/builtin/packages/daos/package.py @@ -33,6 +33,7 @@ class Daos(SConsPackage): depends_on("boost", type="build") depends_on("cmocka", type="build") depends_on("go", type="build") + depends_on("pkgconfig", type="build") depends_on("hwloc") depends_on("isa-l@2.30.0:") depends_on("isa-l-crypto@2.23.0:") diff --git a/var/spack/repos/builtin/packages/dpdk/package.py b/var/spack/repos/builtin/packages/dpdk/package.py index 47c8165010d..f99cfc1098b 100644 --- a/var/spack/repos/builtin/packages/dpdk/package.py +++ b/var/spack/repos/builtin/packages/dpdk/package.py @@ -49,7 +49,7 @@ class Dpdk(MakefilePackage, MesonPackage): class MesonBuilder(MesonBuilder): def meson_args(self): - return ["--warnlevel=3"] + return ["--warnlevel=2"] class MakefileBuilder(MakefileBuilder): diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py index e6812b89341..61078203c14 100644 --- a/var/spack/repos/builtin/packages/root/package.py +++ b/var/spack/repos/builtin/packages/root/package.py @@ -190,6 +190,9 @@ class Root(CMakePackage): variant("arrow", default=False, description="Enable Arrow interface") variant("cuda", when="@6.08.00:", default=False, description="Enable CUDA support") variant("cudnn", when="@6.20.02:", default=False, description="Enable cuDNN support") + variant( + "daos", default=False, description="Enable RNTuple support for DAOS storage", when="@6.26:" + ) variant("davix", default=True, description="Compile with external Davix") variant("dcache", default=False, description="Enable support for dCache") variant("emacs", default=False, description="Enable Emacs support") @@ -389,6 +392,7 @@ class Root(CMakePackage): depends_on("cuda", when="+cuda") depends_on("cuda", when="+cudnn") depends_on("cudnn", when="+cudnn") + depends_on("daos", when="+daos") depends_on("davix @0.7.1:", when="+davix") depends_on("dcap", when="+dcache") depends_on("cfitsio", when="+fits") @@ -560,6 +564,7 @@ def _add_variant(variants, features, featurename, variantname): variants.append("~%s" % variantname[1:]) _add_variant(v, f, "cocoa", "+aqua") + _add_variant(v, f, "daos", "+daos") _add_variant(v, f, "davix", "+davix") _add_variant(v, f, "dcache", "+dcache") _add_variant(v, f, "fftw3", "+fftw") @@ -706,6 +711,7 @@ def cmake_args(self): define_from_variant("cocoa", "aqua"), define("dataframe", True), define_from_variant("davix"), + define_from_variant("daos"), define_from_variant("dcache"), define_from_variant("fftw3", "fftw"), define_from_variant("fitsio", "fits"), diff --git a/var/spack/repos/builtin/packages/spdk/package.py b/var/spack/repos/builtin/packages/spdk/package.py index a20e4767f0d..b370c1fa376 100644 --- a/var/spack/repos/builtin/packages/spdk/package.py +++ b/var/spack/repos/builtin/packages/spdk/package.py @@ -61,6 +61,8 @@ class Spdk(AutotoolsPackage): depends_on("c", type="build") # generated depends_on("cxx", type="build") # generated + depends_on("libtool", type="build") + depends_on("pkgconfig", type="build") depends_on("dpdk@22.11:", when="+dpdk") depends_on("fio@3.33", when="+fio") @@ -70,6 +72,7 @@ class Spdk(AutotoolsPackage): depends_on("numactl") depends_on("py-pyelftools") depends_on("rdma-core", when="+rdma") + depends_on("uuid") def configure_args(self): spec = self.spec