From d3649a32cab384db62ed80e5775dcdf78b3fe979 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 3 Apr 2022 07:51:10 +1000 Subject: [PATCH 1/2] Updated zlib on macOS to 1.2.12 --- config.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config.sh b/config.sh index a4e70f00..9f65afe4 100644 --- a/config.sh +++ b/config.sh @@ -14,7 +14,7 @@ TIFF_VERSION=4.3.0 LCMS2_VERSION=2.13.1 if [[ -n "$IS_MACOS" ]]; then GIFLIB_VERSION=5.1.4 - ZLIB_VERSION=1.2.11 + ZLIB_VERSION=1.2.12 else GIFLIB_VERSION=5.2.1 ZLIB_VERSION=1.2.8 @@ -54,6 +54,9 @@ function pre_build { if [ -z "$IS_ALPINE" ] && [ -z "$IS_MACOS" ]; then yum remove -y zlib-devel fi + + # Workaround for zlib 1.2.12 + export cc=$CC build_new_zlib if [ -n "$IS_MACOS" ]; then From ce097fadd2b95e3b78925041d66e4627e964d9e6 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 3 Apr 2022 12:12:40 +1000 Subject: [PATCH 2/2] Updated zlib on musllinux to 1.2.12 --- config.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/config.sh b/config.sh index 9f65afe4..e60963fc 100644 --- a/config.sh +++ b/config.sh @@ -14,9 +14,12 @@ TIFF_VERSION=4.3.0 LCMS2_VERSION=2.13.1 if [[ -n "$IS_MACOS" ]]; then GIFLIB_VERSION=5.1.4 - ZLIB_VERSION=1.2.12 else GIFLIB_VERSION=5.2.1 +fi +if [[ -n "$IS_MACOS" ]] || [[ -n "$IS_ALPINE" ]]; then + ZLIB_VERSION=1.2.12 +else ZLIB_VERSION=1.2.8 fi LIBWEBP_VERSION=1.2.2 @@ -55,8 +58,10 @@ function pre_build { yum remove -y zlib-devel fi - # Workaround for zlib 1.2.12 - export cc=$CC + if [[ -n "$IS_MACOS" ]]; then + # Workaround for zlib 1.2.12 + export cc=$CC + fi build_new_zlib if [ -n "$IS_MACOS" ]; then