]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
win32_deps_build.sh: pin zlib tag 61631/head
authorLucian Petrut <lpetrut@cloudbasesolutions.com>
Mon, 3 Feb 2025 14:53:05 +0000 (14:53 +0000)
committerIlya Dryomov <idryomov@gmail.com>
Mon, 3 Feb 2025 19:49:32 +0000 (20:49 +0100)
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>
(cherry picked from commit ba9270dc9fe923bb9639a29328035e78ad4346c7)

win32_deps_build.sh

index 491eb28093faca79ecb02d8079a38dcdd80eb376..d68a452beb19a05b7b82b32f679f5ca122699a1b 100755 (executable)
@@ -22,6 +22,7 @@ boostSrcDir="${depsSrcDir}/boost_1_82_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...