From dad68e41e09b621585429628b33c63cbd5c83269 Mon Sep 17 00:00:00 2001 From: "Seth R. Johnson" Date: Tue, 26 Oct 2021 06:07:48 -0400 Subject: [PATCH] freetype: explicitly specify dependencies (#26942) Freetype picked up 'brotli' from homebrew, causing issues downstream. --- var/spack/repos/builtin/packages/freetype/package.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/freetype/package.py b/var/spack/repos/builtin/packages/freetype/package.py index 6eaf50ae2c..916a15f623 100644 --- a/var/spack/repos/builtin/packages/freetype/package.py +++ b/var/spack/repos/builtin/packages/freetype/package.py @@ -27,8 +27,8 @@ class Freetype(AutotoolsPackage): version('2.7', sha256='7b657d5f872b0ab56461f3bd310bd1c5ec64619bd15f0d8e08282d494d9cfea4') version('2.5.3', sha256='41217f800d3f40d78ef4eb99d6a35fd85235b64f81bc56e4812d7672fca7b806') - depends_on('libpng') depends_on('bzip2') + depends_on('libpng') depends_on('pkgconfig', type='build') conflicts('%intel', when='@2.8:', @@ -44,7 +44,13 @@ def headers(self): return headers def configure_args(self): - args = ['--with-harfbuzz=no'] + args = [ + '--with-brotli=no', + '--with-bzip2=yes', + '--with-harfbuzz=no', + '--with-png=yes', + '--with-zlib=no', + ] if self.spec.satisfies('@2.9.1:'): args.append('--enable-freetype-config') return args