hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

acts: fix self-referential dependencies (#42455)

Browse source
This commit is contained in:
Massimiliano Culpo 2024-02-02 18:34:34 +01:00 committed by GitHub
parent 9c4e44a0ad
commit 9ffe179934
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
var/spack/repos/builtin/packages/acts/package.py
View file

@ -337,8 +337,11 @@ class Acts(CMakePackage, CudaPackage):
conflicts("+onnx", when="@23.3:", msg="py-onnxruntime@1.12: required but not yet available") conflicts("+onnx", when="@23.3:", msg="py-onnxruntime@1.12: required but not yet available")
depends_on("py-pybind11 @2.6.2:", when="+python @18:") depends_on("py-pybind11 @2.6.2:", when="+python @18:")
depends_on("py-pytest", when="+python +unit_tests") depends_on("py-pytest", when="+python +unit_tests")
depends_on("root @6.10:", when="+tgeo @:0.8.0")
depends_on("root @6.20:", when="+tgeo @0.8.1:") with when("+tgeo"):
depends_on("root @6.10:")
depends_on("root @6.20:", when="@0.8.1:")
depends_on("sycl", when="+sycl") depends_on("sycl", when="+sycl")
depends_on("vecmem@0.4: +sycl", when="+sycl") depends_on("vecmem@0.4: +sycl", when="+sycl")
@ -347,12 +350,18 @@ class Acts(CMakePackage, CudaPackage):
if isinstance(_cxxstd, _ConditionalVariantValues): if isinstance(_cxxstd, _ConditionalVariantValues):
for _v in _cxxstd: for _v in _cxxstd:
depends_on( depends_on(
f"geant4 cxxstd={_v.value}", when=f"cxxstd={_v.value} {_v.when} ^geant4" f"geant4 cxxstd={_v.value}", when=f"cxxstd={_v.value} {_v.when} +geant4"
) )
depends_on(f"root cxxstd={_v.value}", when=f"cxxstd={_v.value} {_v.when} ^root") depends_on(
f"geant4 cxxstd={_v.value}", when=f"cxxstd={_v.value} {_v.when} +fatras_geant4"
)
depends_on(f"root cxxstd={_v.value}", when=f"cxxstd={_v.value} {_v.when} +tgeo")
else: else:
depends_on(f"geant4 cxxstd={_v.value}", when=f"cxxstd={_v.value} {_v.when} ^geant4") depends_on(f"geant4 cxxstd={_v.value}", when=f"cxxstd={_v.value} {_v.when} +geant4")
depends_on(f"root cxxstd={_cxxstd}", when=f"cxxstd={_cxxstd} ^root") depends_on(
f"geant4 cxxstd={_v.value}", when=f"cxxstd={_v.value} {_v.when} +fatras_geant4"
)
depends_on(f"root cxxstd={_cxxstd}", when=f"cxxstd={_cxxstd} +tgeo")
# ACTS has been using C++17 for a while, which precludes use of old GCC # ACTS has been using C++17 for a while, which precludes use of old GCC
conflicts("%gcc@:7", when="@0.23:") conflicts("%gcc@:7", when="@0.23:")