hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

use conflicts() instead of referring to SpecError in mesa (#26562)

Browse source 
* mesa: use conflicts() instead of referring to SpecError
This commit is contained in:
Danny McClanahan 2021-10-06 17:07:42 +00:00 committed by GitHub
parent fefe624141
commit e2e8e5c1e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
var/spack/repos/builtin/packages/mesa/package.py
View file

@ -39,11 +39,15 @@ class Mesa(MesonPackage):
# Internal options # Internal options
variant('llvm', default=True, description="Enable LLVM.") variant('llvm', default=True, description="Enable LLVM.")
variant('swr', default='auto', _SWR_AUTO_VALUE = 'auto'
values=('auto', 'none', 'avx', 'avx2', 'knl', 'skx'), _SWR_ENABLED_VALUES = (_SWR_AUTO_VALUE, 'avx', 'avx2', 'knl', 'skx')
_SWR_DISABLED_VALUES = ('none',)
variant('swr', default=_SWR_AUTO_VALUE,
values=_SWR_DISABLED_VALUES + _SWR_ENABLED_VALUES,
multi=True, multi=True,
description="Enable the SWR driver.") description="Enable the SWR driver.")
# conflicts('~llvm', when='~swr=none') for swr_enabled_value in _SWR_ENABLED_VALUES:
conflicts('~llvm', when='swr={0}'.format(swr_enabled_value))
# Front ends # Front ends
variant('osmesa', default=True, description="Enable the OSMesa frontend.") variant('osmesa', default=True, description="Enable the OSMesa frontend.")
@ -192,8 +196,6 @@ def meson_args(self):
args_swr_arches.append('skx') args_swr_arches.append('skx')
if args_swr_arches: if args_swr_arches:
if '+llvm' not in spec:
raise SpecError('Variant swr requires +llvm')
args_gallium_drivers.append('swr') args_gallium_drivers.append('swr')
args.append('-Dswr-arches=' + ','.join(args_swr_arches)) args.append('-Dswr-arches=' + ','.join(args_swr_arches))