summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkurtsansom <56605142+kurtsansom@users.noreply.github.com>2021-03-31 12:25:18 -0500
committerGitHub <noreply@github.com>2021-03-31 11:25:18 -0600
commit904867703e06134d8b9767a10b6f5806a188adf9 (patch)
tree4954fc90550996c78d0ccf17d47130e3fdac71ed
parent1ed7762327e0bdc4be4a1780f3bd2d4c8c3db533 (diff)
downloadspack-904867703e06134d8b9767a10b6f5806a188adf9.tar.gz
spack-904867703e06134d8b9767a10b6f5806a188adf9.tar.bz2
spack-904867703e06134d8b9767a10b6f5806a188adf9.tar.xz
spack-904867703e06134d8b9767a10b6f5806a188adf9.zip
fix: modify for change in meson options (#22678)
-rw-r--r--var/spack/repos/builtin/packages/mesa/package.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/mesa/package.py b/var/spack/repos/builtin/packages/mesa/package.py
index fb0e876484..f38e9ea2de 100644
--- a/var/spack/repos/builtin/packages/mesa/package.py
+++ b/var/spack/repos/builtin/packages/mesa/package.py
@@ -123,11 +123,17 @@ class Mesa(MesonPackage):
args.append('-Dlibunwind=disabled')
num_frontends = 0
+
+ if spec.satisfies('@:20.3'):
+ osmesa_enable, osmesa_disable = ('gallium', 'none')
+ else:
+ osmesa_enable, osmesa_disable = ('true', 'false')
+
if '+osmesa' in spec:
num_frontends += 1
- args.append('-Dosmesa=gallium')
+ args.append('-Dosmesa={0}'.format(osmesa_enable))
else:
- args.append('-Dosmesa=none')
+ args.append('-Dosmesa={0}'.format(osmesa_disable))
if '+glx' in spec:
num_frontends += 1