From 9b17deb11e3657ae205d874d36a0a91ff71d8dd5 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Fri, 15 Nov 2019 18:20:28 +0100 Subject: [PATCH] Install zlib on macOS https://community-tc.services.mozilla.com/tasks/fcbLrz33RHeshgRZGvSAjg/runs/0/logs/https%3A%2F%2Fcommunity-tc.services.mozilla.com%2Fapi%2Fqueue%2Fv1%2Ftask%2FfcbLrz33RHeshgRZGvSAjg%2Fruns%2F0%2Fartifacts%2Fpublic%2Flogs%2Flive.log#L1359 Note that the above is on macOS 10.15. Maybe previous versions provided zlib system-wide? --- etc/taskcluster/decision_task.py | 1 + etc/taskcluster/macos/Brewfile | 1 + 2 files changed, 2 insertions(+) diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py index e2288f45366..72e62985356 100644 --- a/etc/taskcluster/decision_task.py +++ b/etc/taskcluster/decision_task.py @@ -909,6 +909,7 @@ def macos_build_task(name): export OPENSSL_INCLUDE_DIR="$(brew --prefix openssl)/include" export OPENSSL_LIB_DIR="$(brew --prefix openssl)/lib" export PKG_CONFIG_PATH="$(brew --prefix libffi)/lib/pkgconfig/" + export PKG_CONFIG_PATH="$(brew --prefix zlib)/lib/pkgconfig/:$PKG_CONFIG_PATH" """) .with_directory_mount( diff --git a/etc/taskcluster/macos/Brewfile b/etc/taskcluster/macos/Brewfile index d13b3cfa678..ab177ef32d6 100644 --- a/etc/taskcluster/macos/Brewfile +++ b/etc/taskcluster/macos/Brewfile @@ -5,6 +5,7 @@ brew "openssl" brew "pkg-config" brew "llvm" brew "yasm" +brew "zlib" # For sccache brew "openssl@1.1"