diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2018-08-07 03:18:05 -0500 |
|---|---|---|
| committer | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2018-08-07 10:18:05 +0200 |
| commit | 79e7359f4de2d16b3d35ca89288d3d5f6256e000 (patch) | |
| tree | bf047ccc0df479dc3db8377fdc0ef1a2d7970b86 | |
| parent | 6ef2eb8f7eecaad3f6162cc3fea7a83bec0e8dfd (diff) | |
| download | spack-79e7359f4de2d16b3d35ca89288d3d5f6256e000.tar.gz spack-79e7359f4de2d16b3d35ca89288d3d5f6256e000.tar.bz2 spack-79e7359f4de2d16b3d35ca89288d3d5f6256e000.tar.xz spack-79e7359f4de2d16b3d35ca89288d3d5f6256e000.zip | |
Add libs attribute to mesa and mesa-glu packages (#8904)
Also fix dependency version in glvis package.
Fixes build errors mentioned in #8454.
5 files changed, 17 insertions, 10 deletions
diff --git a/var/spack/repos/builtin/packages/glvis/package.py b/var/spack/repos/builtin/packages/glvis/package.py index a79ca2dd1a..3330656439 100644 --- a/var/spack/repos/builtin/packages/glvis/package.py +++ b/var/spack/repos/builtin/packages/glvis/package.py @@ -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') diff --git a/var/spack/repos/builtin/packages/mesa-glu/package.py b/var/spack/repos/builtin/packages/mesa-glu/package.py index 608a23cd8b..39b56a37e9 100644 --- a/var/spack/repos/builtin/packages/mesa-glu/package.py +++ b/var/spack/repos/builtin/packages/mesa-glu/package.py @@ -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 diff --git a/var/spack/repos/builtin/packages/mesa/package.py b/var/spack/repos/builtin/packages/mesa/package.py index 1fcd8214af..9869286e03 100644 --- a/var/spack/repos/builtin/packages/mesa/package.py +++ b/var/spack/repos/builtin/packages/mesa/package.py @@ -197,3 +197,11 @@ class Mesa(AutotoolsPackage): 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 diff --git a/var/spack/repos/builtin/packages/opengl/package.py b/var/spack/repos/builtin/packages/opengl/package.py index 6d0ee752d3..31be247dad 100644 --- a/var/spack/repos/builtin/packages/opengl/package.py +++ b/var/spack/repos/builtin/packages/opengl/package.py @@ -80,9 +80,6 @@ class Opengl(Package): 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 @@ class Opengl(Package): shared=True, recursive=False) if libs: return libs - return None diff --git a/var/spack/repos/builtin/packages/openglu/package.py b/var/spack/repos/builtin/packages/openglu/package.py index 992a13fbcb..125c3e4da5 100644 --- a/var/spack/repos/builtin/packages/openglu/package.py +++ b/var/spack/repos/builtin/packages/openglu/package.py @@ -76,9 +76,6 @@ class Openglu(Package): raise InstallError(msg) - def install(self, spec, prefix): - pass - @property def libs(self): for dir in ['lib64', 'lib']: @@ -86,4 +83,3 @@ class Openglu(Package): shared=True, recursive=False) if libs: return libs - return None |