From f2f13964fbb0d29a74f605e31b20f724d88cc024 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 3 Feb 2025 22:24:35 -0600 Subject: [PATCH] sherpa: support cxxstd=20 when=@3: (#48829) * sherpa: support cxxstd=20 when=@3: * hep: sherpa cxxstd=20 --- share/spack/gitlab/cloud_pipelines/stacks/hep/spack.yaml | 2 +- var/spack/repos/builtin/packages/sherpa/package.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/share/spack/gitlab/cloud_pipelines/stacks/hep/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/hep/spack.yaml index cb01d041a08..fbd7ace6127 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/hep/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/hep/spack.yaml @@ -83,7 +83,7 @@ spack: - pythia8 +evtgen +fastjet +hdf5 +hepmc +hepmc3 +lhapdf ~madgraph5amc +python +rivet ~root # pythia8 and root circularly depend - rivet hepmc=3 - root +davix +dcache +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 +unuran +vc +vdt +veccore +webgui +x +xml +xrootd - - sherpa +analysis ~blackhat +gzip +hepmc3 +hepmc3root +lhapdf +lhole +openloops +pythia ~python ~recola ~rivet +root +ufo + - sherpa +analysis ~blackhat +gzip +hepmc3 +hepmc3root +lhapdf +lhole +openloops +pythia ~python ~recola ~rivet +root +ufo cxxstd=20 - tauola +hepmc3 +lhapdf cxxstd=20 - thepeg hepmc=3 ~rivet - vecgeom +gdml +geant4 +root diff --git a/var/spack/repos/builtin/packages/sherpa/package.py b/var/spack/repos/builtin/packages/sherpa/package.py index d7f2a019548..4d0e6ecec38 100644 --- a/var/spack/repos/builtin/packages/sherpa/package.py +++ b/var/spack/repos/builtin/packages/sherpa/package.py @@ -39,7 +39,7 @@ class Sherpa(CMakePackage, AutotoolsPackage): depends_on("cxx", type="build") # generated depends_on("fortran", type="build") # generated - _cxxstd_values = ("11", "14", "17") + _cxxstd_values = (conditional("11", "14", "17", when="@:"), conditional("20", when="@3:")) variant( "cxxstd", default="11", @@ -114,7 +114,8 @@ class Sherpa(CMakePackage, AutotoolsPackage): filter_compiler_wrappers("share/SHERPA-MC/makelibs") for std in _cxxstd_values: - depends_on("root cxxstd=" + std, when="+root cxxstd=" + std) + for v in std: + depends_on(f"root cxxstd={v.value}", when=f"+root cxxstd={v.value}") def patch(self): filter_file(