From 4a81331c6e717bbdf7fae16e61d486947abdff72 Mon Sep 17 00:00:00 2001 From: Chuck Atkins Date: Wed, 6 Feb 2019 14:24:42 -0500 Subject: [PATCH] Use gl and glx version ranges instead of exact versions --- var/spack/repos/builtin/packages/mesa/package.py | 6 ++---- var/spack/repos/builtin/packages/paraview/package.py | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/var/spack/repos/builtin/packages/mesa/package.py b/var/spack/repos/builtin/packages/mesa/package.py index c730878fa1e..5d244267fad 100644 --- a/var/spack/repos/builtin/packages/mesa/package.py +++ b/var/spack/repos/builtin/packages/mesa/package.py @@ -37,8 +37,6 @@ class Mesa(MesonPackage): variant('swr', values=any_combination_of('avx', 'avx2', 'knl', 'skx'), description="Enable the SWR driver.") # conflicts('~llvm', when='~swr=none') - variant('a', default=True) - variant('b', default=False) # Front ends variant('osmesa', default=True, description="Enable the OSMesa frontend.") @@ -57,8 +55,8 @@ class Mesa(MesonPackage): variant('opengles', default=False, description="Enable OpenGL ES support.") # Provides - provides('gl@4.5', when='+opengl') - provides('glx@1.4', when='+glx') + provides('gl@:4.5', when='+opengl') + provides('glx@:1.4', when='+glx') provides('egl', when='+egl') # Variant dependencies diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py index 560ba8c3067..16e1c5a610d 100644 --- a/var/spack/repos/builtin/packages/paraview/package.py +++ b/var/spack/repos/builtin/packages/paraview/package.py @@ -47,8 +47,8 @@ class Paraview(CMakePackage): depends_on('qt@:4', when='@:5.2.0+qt') depends_on('mesa+osmesa', when='+osmesa') - depends_on('gl@3.2', when='+opengl2') - depends_on('gl@1.2', when='~opengl2') + depends_on('gl@3.2:', when='+opengl2') + depends_on('gl@1.2:', when='~opengl2') depends_on('libxt', when='+qt') conflicts('+qt', when='+osmesa')