This is an automated email from the ASF dual-hosted git repository. granthenke pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/kudu.git
commit e63bed4811b73e6255a881effdf5eab707700131 Author: Grant Henke <[email protected]> AuthorDate: Fri May 15 14:39:32 2020 -0500 KUDU-2817: Upgrade snappy to 1.1.8 We are currently on snappy 1.1.4 which is from 2017 and the latest release is from January 2020. This patch upgrades to snappy 1.1.8 which pulls in various fixes and improvements. See the release notes for all the changes: https://github.com/google/snappy/releases I adjusted the build scripts now that snappy uses cmake instead of autoconf. I used the parameters passed to lz4 for inspiration. Change-Id: I19e4eda122c0ea957bbe504fc7de681bb72068cd Reviewed-on: http://gerrit.cloudera.org:8080/15927 Tested-by: Kudu Jenkins Reviewed-by: Alexey Serbin <[email protected]> --- thirdparty/build-definitions.sh | 17 +++++++++-------- thirdparty/download-thirdparty.sh | 3 +-- thirdparty/vars.sh | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/thirdparty/build-definitions.sh b/thirdparty/build-definitions.sh index cb93032..017fd3d 100644 --- a/thirdparty/build-definitions.sh +++ b/thirdparty/build-definitions.sh @@ -519,15 +519,16 @@ build_snappy() { SNAPPY_BDIR=$TP_BUILD_DIR/$SNAPPY_NAME$MODE_SUFFIX mkdir -p $SNAPPY_BDIR pushd $SNAPPY_BDIR + rm -Rf CMakeCache.txt CMakeFiles/ CFLAGS="$EXTRA_CFLAGS" \ - CXXFLAGS="$EXTRA_CXXFLAGS" \ - LDFLAGS="$EXTRA_LDFLAGS" \ - LIBS="$EXTRA_LIBS" \ - $SNAPPY_SOURCE/configure \ - --with-pic \ - --prefix=$PREFIX - fixup_libtool - make -j$PARALLEL $EXTRA_MAKEFLAGS install + cmake \ + -DCMAKE_BUILD_TYPE=release \ + -DBUILD_STATIC_LIBS=ON \ + -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX \ + -DSNAPPY_BUILD_TESTS=OFF \ + $EXTRA_CMAKE_FLAGS \ + $SNAPPY_SOURCE + ${NINJA:-make} -j$PARALLEL $EXTRA_MAKEFLAGS install popd } diff --git a/thirdparty/download-thirdparty.sh b/thirdparty/download-thirdparty.sh index aa666ed..bc1b930 100755 --- a/thirdparty/download-thirdparty.sh +++ b/thirdparty/download-thirdparty.sh @@ -247,8 +247,7 @@ SNAPPY_PATCHLEVEL=0 fetch_and_patch \ snappy-${SNAPPY_VERSION}.tar.gz \ $SNAPPY_SOURCE \ - $SNAPPY_PATCHLEVEL \ - "autoreconf -fvi" + $SNAPPY_PATCHLEVEL ZLIB_PATCHLEVEL=0 fetch_and_patch \ diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh index 8bb265b..108d13a 100644 --- a/thirdparty/vars.sh +++ b/thirdparty/vars.sh @@ -64,7 +64,7 @@ CMAKE_VERSION=3.16.4 CMAKE_NAME=cmake-$CMAKE_VERSION CMAKE_SOURCE=$TP_SOURCE_DIR/$CMAKE_NAME -SNAPPY_VERSION=1.1.4 +SNAPPY_VERSION=1.1.8 SNAPPY_NAME=snappy-$SNAPPY_VERSION SNAPPY_SOURCE=$TP_SOURCE_DIR/$SNAPPY_NAME
