zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

root: fix variant detection (#38436)

Browse Source
This commit is contained in:
Valentin Volkl 2023-06-20 15:47:49 +02:00 committed by GitHub
parent 9eb3de85c5
commit f461069888
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
var/spack/repos/builtin/packages/root/package.py
View File

@ -408,8 +408,11 @@ def _add_variant(variants, features, featurename, variantname):
_add_variant(v, f, ("qt", "qtgsi"), "+qt4")
_add_variant(v, f, "r", "+r")
_add_variant(v, f, "roofit", "+roofit")
_add_variant(v, f, ("root7", "webgui"), "+webgui") # for root version >= 6.18.00
_add_variant(v, f, ("root7", "webui"), "+webgui") # for root version <= 6.17.02
# webui feature renamed to webgui in 6.18
if Version(version_str).satisfies("@6.18:"):
_add_variant(v, f, ("root7", "webgui"), "+webgui")
else:
_add_variant(v, f, ("root7", "webui"), "+webgui")
_add_variant(v, f, "rpath", "+rpath")
_add_variant(v, f, "shadowpw", "+shadow")
_add_variant(v, f, "spectrum", "+spectrum")