Merge pull request #280 from radarhere/zlib

This commit is contained in:
Hugo van Kemenade 2022-04-08 13:24:35 +03:00 committed by GitHub
commit 68b95e3782
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -14,9 +14,12 @@ TIFF_VERSION=4.3.0
LCMS2_VERSION=2.13.1 LCMS2_VERSION=2.13.1
if [[ -n "$IS_MACOS" ]]; then if [[ -n "$IS_MACOS" ]]; then
GIFLIB_VERSION=5.1.4 GIFLIB_VERSION=5.1.4
ZLIB_VERSION=1.2.11
else else
GIFLIB_VERSION=5.2.1 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 ZLIB_VERSION=1.2.8
fi fi
LIBWEBP_VERSION=1.2.2 LIBWEBP_VERSION=1.2.2
@ -54,6 +57,11 @@ function pre_build {
if [ -z "$IS_ALPINE" ] && [ -z "$IS_MACOS" ]; then if [ -z "$IS_ALPINE" ] && [ -z "$IS_MACOS" ]; then
yum remove -y zlib-devel yum remove -y zlib-devel
fi fi
if [[ -n "$IS_MACOS" ]]; then
# Workaround for zlib 1.2.12
export cc=$CC
fi
build_new_zlib build_new_zlib
if [ -n "$IS_MACOS" ]; then if [ -n "$IS_MACOS" ]; then