From: Lucian Petrut <lpetrut@cloudbasesolutions.com>
Date: Mon, 3 Feb 2025 14:53:05 +0000 (+0000)
Subject: win32_deps_build.sh: pin zlib tag
X-Git-Tag: testing/wip-pdonnell-testing-20250205.170831-debug~26^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ba9270dc9fe923bb9639a29328035e78ad4346c7;p=ceph-ci.git

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 <lpetrut@cloudbasesolutions.com>
---

diff --git a/win32_deps_build.sh b/win32_deps_build.sh
index 49d26710dd0..4d92b2443eb 100755
--- a/win32_deps_build.sh
+++ b/win32_deps_build.sh
@@ -22,6 +22,7 @@ boostSrcDir="${depsSrcDir}/boost_1_85_0"
 boostDir="${depsToolsetDir}/boost"
 zlibDir="${depsToolsetDir}/zlib"
 zlibSrcDir="${depsSrcDir}/zlib"
+zlibTag="v1.3.1"
 backtraceDir="${depsToolsetDir}/libbacktrace"
 backtraceSrcDir="${depsSrcDir}/libbacktrace"
 snappySrcDir="${depsSrcDir}/snappy"
@@ -120,7 +121,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...