diff options
| author | Ida Mjelde <102957074+imjelde@users.noreply.github.com> | 2022-05-11 12:44:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-11 10:44:17 +0000 |
| commit | 49948bb3e700051ba4c8592a506055c0e5f44100 (patch) | |
| tree | d365e62d4585ed127961890810f6306e856aee7e /var | |
| parent | c9c347f0f07ea2958a900fb0d09d7d56750644f6 (diff) | |
| download | spack-49948bb3e700051ba4c8592a506055c0e5f44100.tar.gz spack-49948bb3e700051ba4c8592a506055c0e5f44100.tar.bz2 spack-49948bb3e700051ba4c8592a506055c0e5f44100.tar.xz spack-49948bb3e700051ba4c8592a506055c0e5f44100.zip | |
root: changes due to var name webui->webgui from version 6.17.02 (#29964)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/root/package.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py index 2f4f837f7b..36ec273d3c 100644 --- a/var/spack/repos/builtin/packages/root/package.py +++ b/var/spack/repos/builtin/packages/root/package.py @@ -390,7 +390,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', 'webui'), '+root7') + _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, 'rpath', '+rpath') _add_variant(v, f, 'shadowpw', '+shadow') _add_variant(v, f, 'spectrum', '+spectrum') @@ -540,13 +541,19 @@ class Root(CMakePackage): define_from_variant('vdt'), define_from_variant('veccore'), define_from_variant('vmc'), - define_from_variant('webui', 'root7'), # requires root7 define_from_variant('x11', 'x'), define_from_variant('xft', 'x'), define_from_variant('xml'), define_from_variant('xrootd') ] + # 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')) + if self.spec.satisfies('@6.18.00:'): + options.append(define_from_variant('webgui', 'root7')) + # Some special features if self.spec.satisfies('@6.20.02:'): options.append(define_from_variant('pyroot', 'python')) |