From 88bd289caa442fbd26b7263a77ecf6650c5372c2 Mon Sep 17 00:00:00 2001
From: Mingyu Chen <morningman@163.com>
Date: Fri, 26 Apr 2019 17:03:55 +0800
Subject: [PATCH] Modify thirdparties (#1044)

1. Update snappy from 1.1.4 to 1.1.7
2. disable ssl of librdkafka
---
 thirdparty/build-thirdparty.sh | 22 ++++++++++++++--------
 thirdparty/vars.sh             |  8 ++++----
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index 1068cc1b57..b36d820ff8 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -319,12 +319,16 @@ build_snappy() {
     check_if_source_exist $SNAPPY_SOURCE
     cd $TP_SOURCE_DIR/$SNAPPY_SOURCE
 
-    CPPFLAGS="-I${TP_INCLUDE_DIR}" \
-    LDFLAGS="-L${TP_LIB_DIR}" \
-    CFLAGS="-fPIC" \
-    ./configure --prefix=$TP_INSTALL_DIR --disable-shared --enable-static \
-    --includedir=$TP_INCLUDE_DIR/snappy
+    mkdir build -p && cd build
+    rm -rf CMakeCache.txt CMakeFiles/
+    $CMAKE_CMD -DCMAKE_INSTALL_PREFIX=$TP_INSTALL_DIR \
+    -DCMAKE_POSITION_INDEPENDENT_CODE=On \
+    -DCMAKE_INSTALL_INCLUDEDIR=$TP_INCLUDE_DIR/snappy \
+    -DSNAPPY_BUILD_TESTS=0 ../
     make -j$PARALLEL && make install
+    if [ -f $TP_INSTALL_DIR/lib64/libsnappy.a ]; then
+        mkdir -p $TP_INSTALL_DIR/lib && ln -s $TP_INSTALL_DIR/lib64/libsnappy.a $TP_INSTALL_DIR/lib/libsnappy.a
+    fi
 }
 
 # gperftools
@@ -339,6 +343,9 @@ build_gperftools() {
     LDFLAGS="-L${TP_LIB_DIR}" \
     LD_LIBRARY_PATH="${TP_LIB_DIR}" \
     CFLAGS="-fPIC" \
+    LDFLAGS="-L${TP_LIB_DIR}" \
+    LD_LIBRARY_PATH="${TP_LIB_DIR}" \
+    CFLAGS="-fPIC" \
     ./configure --prefix=$TP_INSTALL_DIR/gperftools --disable-shared --enable-static --disable-libunwind --with-pic --enable-frame-pointers
     make -j$PARALLEL && make install
 }
@@ -456,7 +463,6 @@ build_mysql() {
 #leveldb
 build_leveldb() {
     check_if_source_exist $LEVELDB_SOURCE
-
     cd $TP_SOURCE_DIR/$LEVELDB_SOURCE
     CXXFLAGS="-fPIC" make -j$PARALLEL
     cp out-static/libleveldb.a ../../installed/lib/libleveldb.a
@@ -507,7 +513,7 @@ build_librdkafka() {
     CPPFLAGS="-I${TP_INCLUDE_DIR}" \
     LDFLAGS="-L${TP_LIB_DIR}"
     CFLAGS="-fPIC" \
-    ./configure --prefix=$TP_INSTALL_DIR --enable-static
+    ./configure --prefix=$TP_INSTALL_DIR --enable-static --disable-ssl --disable-sasl
     make -j$PARALLEL && make install
 }
 
@@ -521,8 +527,8 @@ build_openssl
 build_boost # must before thrift
 build_protobuf
 build_gflags
-build_glog
 build_gtest
+build_glog
 build_rapidjson
 build_snappy
 build_gperftools
diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh
index 2454ca8a4e..003d96412f 100644
--- a/thirdparty/vars.sh
+++ b/thirdparty/vars.sh
@@ -115,10 +115,10 @@ GTEST_SOURCE=googletest-release-1.8.0
 GTEST_MD5SUM="16877098823401d1bf2ed7891d7dce36"
 
 # snappy
-SNAPPY_DOWNLOAD="https://github.com/google/snappy/releases/download/1.1.4/snappy-1.1.4.tar.gz"
-SNAPPY_NAME=snappy-1.1.4.tar.gz
-SNAPPY_SOURCE=snappy-1.1.4
-SNAPPY_MD5SUM="c328993b68afe3e5bd87c8ea9bdeb028"
+SNAPPY_DOWNLOAD="https://github.com/google/snappy/archive/1.1.7.tar.gz"
+SNAPPY_NAME=snappy-1.1.7.tar.gz
+SNAPPY_SOURCE=snappy-1.1.7
+SNAPPY_MD5SUM="ee9086291c9ae8deb4dac5e0b85bf54a"
 
 # gperftools
 GPERFTOOLS_DOWNLOAD="https://github.com/gperftools/gperftools/archive/gperftools-2.7.tar.gz"