From 8a8a4cfffcce5fcb2a2d122c8fb641ee1eea76cc Mon Sep 17 00:00:00 2001 From: John Parent Date: Fri, 27 Jan 2023 14:14:14 -0500 Subject: [PATCH] Merge freetype change into this branch --- var/spack/repos/builtin/packages/freetype/package.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/freetype/package.py b/var/spack/repos/builtin/packages/freetype/package.py index 0a6bf2a67c8c09..f73f9c2dd7c9a0 100644 --- a/var/spack/repos/builtin/packages/freetype/package.py +++ b/var/spack/repos/builtin/packages/freetype/package.py @@ -50,9 +50,14 @@ def headers(self): class CMakeBuilder(CMakeBuilder): - def cmake_args(self): - return [self.define("FT_WITH_ZLIB", True), self.define("FT_WITH_BZIP2", True)] - + def cmake_args(self): + return [ + self.define("FT_DISABLE_ZLIB", True), + self.define("FT_DISABLE_BROTLI", True), + self.define("FT_DISABLE_HARFBUZZ", True), + self.define("FT_REQUIRE_PNG", True), + self.define("FT_REQUIRE_BZIP2", True), + ] class AutoToolsBuilder(AutotoolsBuilder): def configure_args(self):