diff options
Diffstat (limited to 'var/spack/repos/builtin/packages/mesa/package.py')
-rw-r--r-- | var/spack/repos/builtin/packages/mesa/package.py | 46 |
1 files changed, 10 insertions, 36 deletions
diff --git a/var/spack/repos/builtin/packages/mesa/package.py b/var/spack/repos/builtin/packages/mesa/package.py index 94b352d8e2..b277a03d19 100644 --- a/var/spack/repos/builtin/packages/mesa/package.py +++ b/var/spack/repos/builtin/packages/mesa/package.py @@ -65,13 +65,9 @@ class Mesa(AutotoolsPackage): variant('opengles', default=False, description="Enable OpenGL ES support.") # Provides - provides('gl@4.5', when='+opengl ~glvnd') - provides('glx@1.4', when='+glx ~glvnd') - # provides('egl@1.5', when='+egl ~glvnd') - - provides('libglvnd-be-gl', when='+glvnd') - provides('libglvnd-be-glx', when='+glvnd +glx') - # provides('libglvnd-be-egl', when='+glvnd +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') @@ -183,32 +179,10 @@ class Mesa(AutotoolsPackage): return args @property - def gl_libs(self): - result = LibraryList(()) - - if '~glvnd' in self.spec: - result.extend(find_libraries('libGL', - root=self.spec.prefix, - shared='+shared' in self.spec, - recursive=True)) - return result - - @property - def glx_libs(self): - result = LibraryList(()) - - if '~glvnd' in self.spec: - result.extend(find_libraries('libGLX', - root=self.spec.prefix, - shared='+shared' in self.spec, - recursive=True)) - return result - - def setup_run_environment(self, env): - if '+glx +glvnd' in self.spec: - env.set('__GLX_VENDOR_LIBRARY_NAME', 'mesa') - - if '+egl +glvnd' in self.spec: - env.set('__EGL_VENDOR_LIBRARY_FILENAMES', ':'.join(( - os.path.join(self.spec.prefix, 'share', 'glvnd', - 'egl_vendor.d', '50_mesa.json')))) + def libs(self): + for dir in ['lib64', 'lib']: + libs = find_libraries(['libGL', 'libOSMesa'], + join_path(self.prefix, dir), + shared=True, recursive=False) + if libs: + return libs |