From 737c88c914b7eb4ed6aace6975e166b1c5a01964 Mon Sep 17 00:00:00 2001 From: Chuck Atkins Date: Wed, 6 Feb 2019 14:29:26 -0500 Subject: [PATCH] glx: provide a default package --- etc/spack/defaults/packages.yaml | 3 ++- var/spack/repos/builtin/packages/mesa/package.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/etc/spack/defaults/packages.yaml b/etc/spack/defaults/packages.yaml index 51278cfc380..c4ba6fd20c7 100644 --- a/etc/spack/defaults/packages.yaml +++ b/etc/spack/defaults/packages.yaml @@ -23,7 +23,8 @@ packages: daal: [intel-daal] elf: [elfutils] fftw-api: [fftw] - gl: [mesa, opengl] + gl: [mesa+opengl, opengl] + glx: [mesa+glx, opengl] glu: [mesa-glu, openglu] golang: [gcc] ipp: [intel-ipp] diff --git a/var/spack/repos/builtin/packages/mesa/package.py b/var/spack/repos/builtin/packages/mesa/package.py index 5d244267fad..375b8b632e0 100644 --- a/var/spack/repos/builtin/packages/mesa/package.py +++ b/var/spack/repos/builtin/packages/mesa/package.py @@ -55,9 +55,9 @@ 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('egl', when='+egl') + provides('gl@4.5', when='+opengl') + provides('glx@1.4', when='+glx') + provides('egl@1.5', when='+egl') # Variant dependencies depends_on('llvm@6:', when='+llvm')