diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2020-11-30 01:34:13 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-30 08:34:13 +0100 |
| commit | aca85080564ae5f254962621f55734ca49b6b697 (patch) | |
| tree | 92167f2e57f7c0794b0123c2ad5b9517fe212e9f /var | |
| parent | a2d156902baad2c96bcf7fd823e2f3f9dd80c226 (diff) | |
| download | spack-aca85080564ae5f254962621f55734ca49b6b697.tar.gz spack-aca85080564ae5f254962621f55734ca49b6b697.tar.bz2 spack-aca85080564ae5f254962621f55734ca49b6b697.tar.xz spack-aca85080564ae5f254962621f55734ca49b6b697.zip | |
Add libs properties to a few packages (#20163)
Diffstat (limited to 'var')
5 files changed, 19 insertions, 10 deletions
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) |