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

mesa: enable the swr variant if +llvm, instead of using conflicts (#29008)

Browse Source 
* mesa: enable the `swr` variant if +llvm, instead of using conflicts

fixes #28994
This commit is contained in:
Massimiliano Culpo 2022-02-16 15:26:29 +01:00 committed by GitHub
parent 3c1b2c0fc9
commit 5272e72344
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
var/spack/repos/builtin/packages/hip-rocclr/package.py
View File

@ -42,7 +42,7 @@ def url_for_version(self, version):
variant('build_type', default='Release', values=("Release", "Debug", "RelWithDebInfo"), description='CMake build type') variant('build_type', default='Release', values=("Release", "Debug", "RelWithDebInfo"), description='CMake build type')
depends_on('cmake@3:', type='build') depends_on('cmake@3:', type='build')
depends_on('mesa~llvm@21: swr=none', type='link') depends_on('mesa~llvm@21:', type='link')
depends_on('libelf', type='link', when="@3.7.0:3.8.0") depends_on('libelf', type='link', when="@3.7.0:3.8.0")
depends_on('numactl', type='link', when="@3.7.0:") depends_on('numactl', type='link', when="@3.7.0:")

4
var/spack/repos/builtin/packages/mesa/package.py
View File

@ -50,10 +50,8 @@ class Mesa(MesonPackage):
_SWR_DISABLED_VALUES = ('none',) _SWR_DISABLED_VALUES = ('none',)
variant('swr', default=_SWR_AUTO_VALUE, variant('swr', default=_SWR_AUTO_VALUE,
values=_SWR_DISABLED_VALUES + _SWR_ENABLED_VALUES, values=_SWR_DISABLED_VALUES + _SWR_ENABLED_VALUES,
multi=True, multi=True, when='+llvm',
description="Enable the SWR driver.") description="Enable the SWR driver.")
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.")