Merge pull request #333 from radarhere/zlib

Updated zlib to 1.2.13
This commit is contained in:
mergify[bot] 2022-10-14 00:52:33 +00:00 committed by GitHub
commit eaf0db475e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -18,7 +18,7 @@ else
GIFLIB_VERSION=5.2.1 GIFLIB_VERSION=5.2.1
fi fi
if [[ -n "$IS_MACOS" ]] || [[ "$MB_ML_VER" != 2014 ]]; then if [[ -n "$IS_MACOS" ]] || [[ "$MB_ML_VER" != 2014 ]]; then
ZLIB_VERSION=1.2.12 ZLIB_VERSION=1.2.13
else else
ZLIB_VERSION=1.2.8 ZLIB_VERSION=1.2.8
fi fi
@ -59,11 +59,6 @@ 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