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

root: changes due to var name webui->webgui from version 6.17.02 (#29964)

Browse Source
This commit is contained in:
Ida Mjelde 2022-05-11 12:44:17 +02:00 committed by GitHub
parent c9c347f0f0
commit 49948bb3e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -390,7 +390,8 @@ 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', '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 @@ def cmake_args(self):
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'))