From f46106988840acea4cf8e04a31c665db3334e2d7 Mon Sep 17 00:00:00 2001 From: Valentin Volkl Date: Tue, 20 Jun 2023 15:47:49 +0200 Subject: root: fix variant detection (#38436) --- var/spack/repos/builtin/packages/root/package.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py index a400051e92..347eb46d0f 100644 --- a/var/spack/repos/builtin/packages/root/package.py +++ b/var/spack/repos/builtin/packages/root/package.py @@ -408,8 +408,11 @@ class Root(CMakePackage): _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") -- cgit v1.2.3-70-g09d2