From 5272e723443e4f82406d58fab5bb202108dbebfb Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Wed, 16 Feb 2022 15:26:29 +0100 Subject: [PATCH] mesa: enable the `swr` variant if +llvm, instead of using conflicts (#29008) * mesa: enable the `swr` variant if +llvm, instead of using conflicts fixes #28994 --- var/spack/repos/builtin/packages/hip-rocclr/package.py | 2 +- var/spack/repos/builtin/packages/mesa/package.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/hip-rocclr/package.py b/var/spack/repos/builtin/packages/hip-rocclr/package.py index 714519e50db..67ee3296f18 100644 --- a/var/spack/repos/builtin/packages/hip-rocclr/package.py +++ b/var/spack/repos/builtin/packages/hip-rocclr/package.py @@ -42,7 +42,7 @@ def url_for_version(self, version): variant('build_type', default='Release', values=("Release", "Debug", "RelWithDebInfo"), description='CMake build type') 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('numactl', type='link', when="@3.7.0:") diff --git a/var/spack/repos/builtin/packages/mesa/package.py b/var/spack/repos/builtin/packages/mesa/package.py index f935543f2fd..0a09e6d8438 100644 --- a/var/spack/repos/builtin/packages/mesa/package.py +++ b/var/spack/repos/builtin/packages/mesa/package.py @@ -50,10 +50,8 @@ class Mesa(MesonPackage): _SWR_DISABLED_VALUES = ('none',) variant('swr', default=_SWR_AUTO_VALUE, values=_SWR_DISABLED_VALUES + _SWR_ENABLED_VALUES, - multi=True, + multi=True, when='+llvm', description="Enable the SWR driver.") - for swr_enabled_value in _SWR_ENABLED_VALUES: - conflicts('~llvm', when='swr={0}'.format(swr_enabled_value)) # Front ends variant('osmesa', default=True, description="Enable the OSMesa frontend.")