From 1454792877dd743b983a44fc4067e7b6a96f7c84 Mon Sep 17 00:00:00 2001 From: Lucian Petrut Date: Mon, 3 Feb 2025 14:53:05 +0000 Subject: [PATCH] win32_deps_build.sh: pin zlib tag The zlib Windows build started to fail, probably because of this: https://github.com/madler/zlib/issues/1038 Cloning into 'zlib'... make: *** No rule to make target 'zconf.h', needed by 'adler32.o'. We'll pin the zlib version for now to unblock the Windows build. Signed-off-by: Lucian Petrut (cherry picked from commit ba9270dc9fe923bb9639a29328035e78ad4346c7) --- win32_deps_build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/win32_deps_build.sh b/win32_deps_build.sh index c50aba54ad185..4f830dcc52b42 100755 --- a/win32_deps_build.sh +++ b/win32_deps_build.sh @@ -25,6 +25,7 @@ boostSrcDir="${depsSrcDir}/boost_1_79_0" boostDir="${depsToolsetDir}/boost" zlibDir="${depsToolsetDir}/zlib" zlibSrcDir="${depsSrcDir}/zlib" +zlibTag="v1.3.1" backtraceDir="${depsToolsetDir}/libbacktrace" backtraceSrcDir="${depsSrcDir}/libbacktrace" snappySrcDir="${depsSrcDir}/snappy" @@ -106,7 +107,7 @@ source "$SCRIPT_DIR/mingw_conf.sh" echo "Building zlib." cd $depsSrcDir if [[ ! -d $zlibSrcDir ]]; then - git clone --depth 1 https://github.com/madler/zlib + git clone --branch $zlibTag --depth 1 https://github.com/madler/zlib fi cd $zlibSrcDir # Apparently the configure script is broken... -- 2.39.5