From 2a43571a68f9a976fad2aa46fdee69f6d99039aa Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 10 Oct 2022 04:13:35 -0500 Subject: root: new variant webgui when +root7 (default True) (#33133) ROOT has a webgui which is available with the `+root7` variant. This is a fairly large part of a ROOT install (275MB out of 732MB on my system) which is not necessarily useful in all use cases (e.g. inside containers on network-restricted HPC/HTC compute nodes). This new variant adds the option to retain the ROOT7 functionality but not necessarily include the `webgui` aspects. --- var/spack/repos/builtin/packages/root/package.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py index c2854a2363..0f012a2657 100644 --- a/var/spack/repos/builtin/packages/root/package.py +++ b/var/spack/repos/builtin/packages/root/package.py @@ -170,6 +170,12 @@ class Root(CMakePackage): "veccore", default=False, description="Enable support for VecCore SIMD abstraction library" ) variant("vmc", default=False, description="Enable the Virtual Monte Carlo interface") + variant( + "webgui", + default=True, + description="Enable web-based UI components of ROOT", + when="+root7", + ) variant("x", default=True, description="Enable set of graphical options") variant("xml", default=True, description="Enable XML parser interface") variant("xrootd", default=False, description="Build xrootd file server and its client") @@ -379,8 +385,8 @@ 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"), "+root7") # for root version >= 6.18.00 - _add_variant(v, f, ("root7", "webui"), "+root7") # for root version <= 6.17.02 + _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 _add_variant(v, f, "rpath", "+rpath") _add_variant(v, f, "shadowpw", "+shadow") _add_variant(v, f, "spectrum", "+spectrum") @@ -542,9 +548,9 @@ class Root(CMakePackage): # Necessary due to name change of variant (webui->webgui) # https://github.com/root-project/root/commit/d631c542909f2f793ca7b06abc622e292dfc4934 if self.spec.satisfies("@:6.17.02"): - options.append(define_from_variant("webui", "root7")) + options.append(define_from_variant("webui", "webgui")) if self.spec.satisfies("@6.18.00:"): - options.append(define_from_variant("webgui", "root7")) + options.append(define_from_variant("webgui", "webgui")) # Some special features if self.spec.satisfies("@6.20.02:"): -- cgit v1.2.3-70-g09d2