diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh index 7cc907d3d9..4bd4000e89 100755 --- a/thirdparty/build-thirdparty.sh +++ b/thirdparty/build-thirdparty.sh @@ -437,7 +437,7 @@ build_mysql() { ${CMAKE_CMD} -G "${GENERATOR}" ../ -DWITH_BOOST=`pwd`/$BOOST_SOURCE -DCMAKE_INSTALL_PREFIX=$TP_INSTALL_DIR/mysql/ \ -DCMAKE_INCLUDE_PATH=$TP_INCLUDE_DIR -DWITHOUT_SERVER=1 -DWITH_ZLIB=$TP_INSTALL_DIR \ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-O3 -g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing -std=gnu++11" \ - -DDISABLE_SHARED=1 -DBUILD_SHARED_LIBS=0 + -DDISABLE_SHARED=1 -DBUILD_SHARED_LIBS=0 -DZLIB_LIBRARY=$TP_INSTALL_DIR/lib/libz.a ${BUILD_SYSTEM} -j $PARALLEL mysqlclient # copy headers manually @@ -457,6 +457,7 @@ build_mysql() { build_leveldb() { check_if_source_exist $LEVELDB_SOURCE cd $TP_SOURCE_DIR/$LEVELDB_SOURCE + rm -rf out-shared/ out-static/ CXXFLAGS="-fPIC" make -j $PARALLEL cp out-static/libleveldb.a ../../installed/lib/libleveldb.a cp -r include/leveldb ../../installed/include/ @@ -470,7 +471,7 @@ build_brpc() { mkdir -p $BUILD_DIR && cd $BUILD_DIR rm -rf CMakeCache.txt CMakeFiles/ LDFLAGS="-L${TP_LIB_DIR} -static-libstdc++ -static-libgcc" \ - ${CMAKE_CMD} -G "${GENERATOR}" -v -DBUILD_SHARED_LIBS=0 -DCMAKE_INSTALL_PREFIX=$TP_INSTALL_DIR \ + ${CMAKE_CMD} -G "${GENERATOR}" -DBUILD_SHARED_LIBS=0 -DCMAKE_INSTALL_PREFIX=$TP_INSTALL_DIR \ -DBRPC_WITH_GLOG=ON -DWITH_GLOG=ON -DGFLAGS_LIBRARY=$TP_INSTALL_DIR/lib/libgflags.a -DGLOG_LIB=$TP_INSTALL_DIR/lib \ -DGFLAGS_INCLUDE_DIR=$TP_INSTALL_DIR/include -DGLOG_LIB=$TP_INSTALL_DIR/lib/libglog.a -DCMAKE_INCLUDE_PATH="$TP_INSTALL_DIR/include" \ -DPROTOBUF_PROTOC_EXECUTABLE=$TP_INSTALL_DIR/bin/protoc .. @@ -589,13 +590,13 @@ build_s2() { rm -rf CMakeCache.txt CMakeFiles/ CXXFLAGS="-O3" \ LDFLAGS="-L${TP_LIB_DIR} -static-libstdc++ -static-libgcc" \ - ${CMAKE_CMD} -G "${GENERATOR}" -v -DBUILD_SHARED_LIBS=0 -DCMAKE_INSTALL_PREFIX=$TP_INSTALL_DIR \ + ${CMAKE_CMD} -G "${GENERATOR}" -DBUILD_SHARED_LIBS=0 -DCMAKE_INSTALL_PREFIX=$TP_INSTALL_DIR \ -DCMAKE_INCLUDE_PATH="$TP_INSTALL_DIR/include" \ -DBUILD_SHARED_LIBS=OFF \ -DGFLAGS_ROOT_DIR="$TP_INSTALL_DIR/include" \ -DWITH_GFLAGS=ON \ -DGLOG_ROOT_DIR="$TP_INSTALL_DIR/include" \ - -DGFLAGS_LIBRARY=$TP_INSTALL_DIR/lib/libgflags.a \ + -DCMAKE_LIBRARY_PATH="$TP_INSTALL_DIR/lib" \ -DWITH_GLOG=ON .. ${BUILD_SYSTEM} -j $PARALLEL && ${BUILD_SYSTEM} install } @@ -659,7 +660,7 @@ build_croaringbitmap() { rm -rf CMakeCache.txt CMakeFiles/ CXXFLAGS="-O3" \ LDFLAGS="-L${TP_LIB_DIR} -static-libstdc++ -static-libgcc" \ - ${CMAKE_CMD} -G "${GENERATOR}" -v -DROARING_BUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX=$TP_INSTALL_DIR \ + ${CMAKE_CMD} -G "${GENERATOR}" -DROARING_BUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX=$TP_INSTALL_DIR \ -DCMAKE_INCLUDE_PATH="$TP_INSTALL_DIR/include" \ -DENABLE_ROARING_TESTS=OFF .. ${BUILD_SYSTEM} -j $PARALLEL && ${BUILD_SYSTEM} install @@ -699,7 +700,7 @@ build_js_and_css() { check_if_source_exist Bootstrap-3.3.7/ check_if_source_exist jQuery-3.3.1/ - mkdir $TP_INSTALL_DIR/webroot/ + mkdir -p $TP_INSTALL_DIR/webroot/ cd $TP_SOURCE_DIR/ cp -r $DATATABLES_SOURCE $TP_INSTALL_DIR/webroot/ cp -r Bootstrap-3.3.7/ $TP_INSTALL_DIR/webroot/ diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh index 6a3b06512a..e8318c0846 100644 --- a/thirdparty/vars.sh +++ b/thirdparty/vars.sh @@ -277,10 +277,10 @@ CCTZ_SOURCE="cctz-2.3" CCTZ_MD5SUM="209348e50b24dbbdec6d961059c2fc92" # datatables, bootstrap 3 and jQuery 3 -DATATABLES_DOWNLOAD="https://datatables.net/download/builder?bs-3.3.7/jq-3.3.1/dt-1.10.23" +DATATABLES_DOWNLOAD="https://datatables.net/download/builder?bs-3.3.7/jq-3.3.1/dt-1.10.24" DATATABLES_NAME="DataTables.zip" -DATATABLES_SOURCE="DataTables-1.10.23" -DATATABLES_MD5SUM="f7f18a9f39d692ec33b5536bff617232" +DATATABLES_SOURCE="DataTables-1.10.24" +DATATABLES_MD5SUM="22404292d02cf3c5f4cd9f5a02d4b42c" # bootstrap table js BOOTSTRAP_TABLE_JS_DOWNLOAD="https://unpkg.com/bootstrap-table@1.17.1/dist/bootstrap-table.min.js" @@ -321,8 +321,8 @@ AWS_C_IO_MD5SUM="b95a6f9d20500727231dd726c957276b" # aws-s2n AWS_S2N_DOWNLOAD="https://github.com/awslabs/s2n/archive/v0.10.0.tar.gz" AWS_S2N_NAME="s2n-0.10.0.tar.gz" -AWS_S2N_SOURCE="s2n-0.10.0" -AWS_S2N_MD5SUM="9b3b39803b7090c2bd937f9cc73bc03f" +AWS_S2N_SOURCE="s2n-tls-0.10.0" +AWS_S2N_MD5SUM="345aa5d2f9e82347bb3e568c22104d0e" # aws-c-cal AWS_C_CAL_DOWNLOAD="https://github.com/awslabs/aws-c-cal/archive/v0.4.5.tar.gz"