From: Kefu Chai <kchai@redhat.com>
Date: Wed, 28 Jul 2021 09:01:06 +0000 (+0800)
Subject: win32_deps_build.sh: bump snappy version to 1.1.9
X-Git-Tag: v16.2.6~69^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=56c1453d03ee5a0e22d25140f0f2b7af0b5e56a9;p=ceph.git

win32_deps_build.sh: bump snappy version to 1.1.9

in snappy, the commit of 26102a0c66175bc39edbf484c994a21902e986dc
fixes the SNAPPY_VERSION generation. and this commit was included by
v1.1.8 and v1.1.9.

also, in v1.1.9, a change was introduced, where the function signature
was changed, and more importantly, this change is not backward
compatible:

<   bool GetUncompressedLength(Source* source, uint32_t* result);
---
>   bool GetUncompressedLength(Source* source, uint32* result);

see also, https://tracker.ceph.com/issues/50934

so we check SNAPPY_VERSION to tell if we should use `uint32_t` or
`uint32`.

in this change, snappy version used to build win32 client is bumped
to the latest stable version, v1.1.9, to include the fix of
SNAPPY_VERSION. this paves the road to fix of https://tracker.ceph.com/issues/50934

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit b04248172d753c1bea9e30af537d5077a1cac251)
---

diff --git a/win32_deps_build.sh b/win32_deps_build.sh
index 7347043fe07..0a1e07ecb44 100755
--- a/win32_deps_build.sh
+++ b/win32_deps_build.sh
@@ -33,7 +33,7 @@ backtraceDir="${depsToolsetDir}/libbacktrace"
 backtraceSrcDir="${depsSrcDir}/libbacktrace"
 snappySrcDir="${depsSrcDir}/snappy"
 snappyDir="${depsToolsetDir}/snappy"
-snappyTag="1.1.7"
+snappyTag="1.1.9"
 # Additional Windows libraries, which aren't provided by Mingw
 winLibDir="${depsToolsetDir}/windows/lib"
 
@@ -231,6 +231,7 @@ cmake -DCMAKE_INSTALL_PREFIX=$snappyDir \
       -DCMAKE_BUILD_TYPE=Release \
       -DBUILD_SHARED_LIBS=ON \
       -DSNAPPY_BUILD_TESTS=OFF \
+      -DSNAPPY_BUILD_BENCHMARKS=OFF \
       -DCMAKE_TOOLCHAIN_FILE=$MINGW_CMAKE_FILE \
       ../
 _make