zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libtiff: add missing dependencies (#29605)

Browse Source 
* libtiff: add missing dependencies

- gl
- glu
- freeglut

* Make X/GL only for Darwin/Mac

* Catch the force_autoreconf property

* add platform=darwin to the autotools deps as well

* Update var/spack/repos/builtin/packages/libtiff/package.py

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
This commit is contained in:
Glenn Johnson
2022-03-30 14:27:01 -05:00
committed by GitHub
parent 36fcf461d9
commit 20000493f3
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
var/spack/repos/builtin/packages/libtiff/package.py
View File

@@ -56,16 +56,24 @@ class Libtiff(AutotoolsPackage):
conflicts('+webp', when='@:4.0.9')
# https://gitlab.com/libtiff/libtiff/-/merge_requests/243
patch('no-include-root.patch', when='@4.3.0')
patch('no-include-root.patch', when='@4.3.0 platform=darwin')
depends_on('automake', when='@4.3.0', type='build')
depends_on('autoconf', when='@4.3.0', type='build')
depends_on('libtool', when='@4.3.0', type='build')
depends_on('m4', when='@4.3.0', type='build')
depends_on('gl', when='@4.3.0 platform=darwin')
depends_on('glu', when='@4.3.0 platform=darwin')
depends_on('freeglut', when='@4.3.0 platform=darwin')
depends_on('libsm', when='@4.3.0 platform=darwin')
depends_on('libice', when='@4.3.0 platform=darwin')
depends_on('libxi', when='@4.3.0 platform=darwin')
depends_on('libx11', when='@4.3.0 platform=darwin')
depends_on('automake', when='@4.3.0 platform=darwin', type='build')
depends_on('autoconf', when='@4.3.0 platform=darwin', type='build')
depends_on('libtool', when='@4.3.0 platform=darwin', type='build')
depends_on('m4', when='@4.3.0 platform=darwin', type='build')
@property
def force_autoreconf(self):
return self.spec.satisfies('@4.3.0')
return self.spec.satisfies('@4.3.0 platform=darwin')
def patch(self):
# Remove flags not recognized by the NVIDIA compiler