Add libs attribute to mesa and mesa-glu packages (#8904)
Also fix dependency version in glvis package. Fixes build errors mentioned in #8454.
This commit is contained in:
parent
6ef2eb8f7e
commit
79e7359f4d
@ -82,7 +82,7 @@ class Glvis(MakefilePackage):
|
||||
description='Use antialiased fonts via freetype & fontconfig')
|
||||
|
||||
depends_on('mfem@develop', when='@develop')
|
||||
depends_on('mfem@3.4', when='@3.4')
|
||||
depends_on('mfem@3.4.0', when='@3.4')
|
||||
depends_on('mfem@3.3', when='@3.3')
|
||||
depends_on('mfem@3.2', when='@3.2')
|
||||
depends_on('mfem@3.1', when='@3.1')
|
||||
|
@ -22,7 +22,6 @@
|
||||
# License along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
##############################################################################
|
||||
#
|
||||
from spack import *
|
||||
|
||||
|
||||
@ -39,3 +38,11 @@ class MesaGlu(AutotoolsPackage):
|
||||
depends_on('mesa', when='+mesa')
|
||||
|
||||
provides('glu@1.3')
|
||||
|
||||
@property
|
||||
def libs(self):
|
||||
for dir in ['lib64', 'lib']:
|
||||
libs = find_libraries('libGLU', join_path(self.prefix, dir),
|
||||
shared=True, recursive=False)
|
||||
if libs:
|
||||
return libs
|
||||
|
@ -197,3 +197,11 @@ def configure(self, spec, prefix):
|
||||
configure(*options)
|
||||
else:
|
||||
raise
|
||||
|
||||
@property
|
||||
def libs(self):
|
||||
for dir in ['lib64', 'lib']:
|
||||
libs = find_libraries('libGL', join_path(self.prefix, dir),
|
||||
shared=True, recursive=False)
|
||||
if libs:
|
||||
return libs
|
||||
|
@ -80,9 +80,6 @@ def fetcher(self):
|
||||
of OpenGL your Mac uses."""
|
||||
raise InstallError(msg)
|
||||
|
||||
def install(self, spec, prefix):
|
||||
pass
|
||||
|
||||
@property
|
||||
def libs(self):
|
||||
for dir in ['lib64', 'lib']:
|
||||
@ -90,4 +87,3 @@ def libs(self):
|
||||
shared=True, recursive=False)
|
||||
if libs:
|
||||
return libs
|
||||
return None
|
||||
|
@ -76,9 +76,6 @@ def fetcher(self):
|
||||
|
||||
raise InstallError(msg)
|
||||
|
||||
def install(self, spec, prefix):
|
||||
pass
|
||||
|
||||
@property
|
||||
def libs(self):
|
||||
for dir in ['lib64', 'lib']:
|
||||
@ -86,4 +83,3 @@ def libs(self):
|
||||
shared=True, recursive=False)
|
||||
if libs:
|
||||
return libs
|
||||
return None
|
||||
|
Loading…
Reference in New Issue
Block a user