From 20000493f36a0c683e2aa08d0de0f077fbaa6589 Mon Sep 17 00:00:00 2001 From: Glenn Johnson Date: Wed, 30 Mar 2022 14:27:01 -0500 Subject: libtiff: add missing dependencies (#29605) * 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 Co-authored-by: Adam J. Stewart --- var/spack/repos/builtin/packages/libtiff/package.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libtiff/package.py b/var/spack/repos/builtin/packages/libtiff/package.py index 7f392457e7..5bde7d3ab6 100644 --- a/var/spack/repos/builtin/packages/libtiff/package.py +++ b/var/spack/repos/builtin/packages/libtiff/package.py @@ -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 -- cgit v1.2.3-70-g09d2