From aca85080564ae5f254962621f55734ca49b6b697 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 30 Nov 2020 01:34:13 -0600 Subject: Add libs properties to a few packages (#20163) --- var/spack/repos/builtin/packages/libxi/package.py | 5 +++++ var/spack/repos/builtin/packages/libxrandr/package.py | 5 +++++ var/spack/repos/builtin/packages/libxxf86vm/package.py | 5 +++++ var/spack/repos/builtin/packages/opengl/package.py | 7 ++----- var/spack/repos/builtin/packages/openglu/package.py | 7 ++----- 5 files changed, 19 insertions(+), 10 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libxi/package.py b/var/spack/repos/builtin/packages/libxi/package.py index 7464deff73..6bd5600b52 100644 --- a/var/spack/repos/builtin/packages/libxi/package.py +++ b/var/spack/repos/builtin/packages/libxi/package.py @@ -25,3 +25,8 @@ class Libxi(AutotoolsPackage, XorgPackage): depends_on('xproto@7.0.13:', type='build') depends_on('xextproto@7.0.3:', type='build') depends_on('inputproto@2.2.99.1:', type='build') + + @property + def libs(self): + return find_libraries( + 'libXi', self.prefix, shared=True, recursive=True) diff --git a/var/spack/repos/builtin/packages/libxrandr/package.py b/var/spack/repos/builtin/packages/libxrandr/package.py index 405da4bbd0..ebd4254cf2 100644 --- a/var/spack/repos/builtin/packages/libxrandr/package.py +++ b/var/spack/repos/builtin/packages/libxrandr/package.py @@ -23,3 +23,8 @@ class Libxrandr(AutotoolsPackage, XorgPackage): depends_on('renderproto', type='build') depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') + + @property + def libs(self): + return find_libraries( + 'libXrandr', self.prefix, shared=True, recursive=True) diff --git a/var/spack/repos/builtin/packages/libxxf86vm/package.py b/var/spack/repos/builtin/packages/libxxf86vm/package.py index 338fb7b0b3..eff997245a 100644 --- a/var/spack/repos/builtin/packages/libxxf86vm/package.py +++ b/var/spack/repos/builtin/packages/libxxf86vm/package.py @@ -22,3 +22,8 @@ class Libxxf86vm(AutotoolsPackage, XorgPackage): depends_on('xf86vidmodeproto@2.2.99.1:', type='build') depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') + + @property + def libs(self): + return find_libraries( + 'libXxf86vm', self.prefix, shared=True, recursive=True) diff --git a/var/spack/repos/builtin/packages/opengl/package.py b/var/spack/repos/builtin/packages/opengl/package.py index 8be03f2577..1dbf3061b4 100644 --- a/var/spack/repos/builtin/packages/opengl/package.py +++ b/var/spack/repos/builtin/packages/opengl/package.py @@ -91,8 +91,5 @@ class Opengl(Package): @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 + return find_libraries( + 'libGL', self.prefix, shared=True, recursive=True) diff --git a/var/spack/repos/builtin/packages/openglu/package.py b/var/spack/repos/builtin/packages/openglu/package.py index 77ddbce2b9..d61d694dec 100644 --- a/var/spack/repos/builtin/packages/openglu/package.py +++ b/var/spack/repos/builtin/packages/openglu/package.py @@ -61,8 +61,5 @@ class Openglu(Package): @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 + return find_libraries( + 'libGLU', self.prefix, shared=True, recursive=True) -- cgit v1.2.3-70-g09d2