[Tool] update thirdparty tar and script (#61500)
all upper cases to CMAKE ON/OFF switch update thirdparty tarball less verbosity of wget downloading archives less verbosity on aws cpp sdk unzip less verbosity on extracting archives Signed-off-by: Kevin Cai <kevin.cai@celerdata.com>
This commit is contained in:
parent
c4f112cb19
commit
1e661f5859
|
|
@ -19,7 +19,7 @@ ARG prebuild_maven=false
|
|||
# value: true | false
|
||||
# default: false
|
||||
ARG predownload_thirdparty=false
|
||||
ARG thirdparty_url=https://cdn-thirdparty.starrocks.com/starrocks-thirdparty-main-20240411.tar
|
||||
ARG thirdparty_url=https://cdn-thirdparty.starrocks.com/starrocks-thirdparty-main-20250731.tar
|
||||
ARG commit_id
|
||||
# check thirdparty/starlet-artifacts-version.sh, to get the right tag
|
||||
ARG starlet_tag=v3.5-rc2
|
||||
|
|
|
|||
|
|
@ -527,7 +527,7 @@ build_gflags() {
|
|||
cd $BUILD_DIR
|
||||
rm -rf CMakeCache.txt CMakeFiles/
|
||||
$CMAKE_CMD -G "${CMAKE_GENERATOR}" -DCMAKE_INSTALL_PREFIX=$TP_INSTALL_DIR \
|
||||
-DCMAKE_POSITION_INDEPENDENT_CODE=On ../
|
||||
-DCMAKE_POSITION_INDEPENDENT_CODE=ON ../
|
||||
${BUILD_SYSTEM} -j$PARALLEL
|
||||
${BUILD_SYSTEM} install
|
||||
}
|
||||
|
|
@ -552,7 +552,7 @@ build_gtest() {
|
|||
cd $BUILD_DIR
|
||||
rm -rf CMakeCache.txt CMakeFiles/
|
||||
$CMAKE_CMD -G "${CMAKE_GENERATOR}" -DCMAKE_INSTALL_PREFIX=$TP_INSTALL_DIR -DCMAKE_INSTALL_LIBDIR=lib \
|
||||
-DCMAKE_POSITION_INDEPENDENT_CODE=On ../
|
||||
-DCMAKE_POSITION_INDEPENDENT_CODE=ON ../
|
||||
${BUILD_SYSTEM} -j$PARALLEL
|
||||
${BUILD_SYSTEM} install
|
||||
}
|
||||
|
|
@ -607,7 +607,7 @@ build_snappy() {
|
|||
$CMAKE_CMD -DCMAKE_INSTALL_PREFIX=$TP_INSTALL_DIR \
|
||||
-G "${CMAKE_GENERATOR}" \
|
||||
-DCMAKE_INSTALL_LIBDIR=lib64 \
|
||||
-DCMAKE_POSITION_INDEPENDENT_CODE=On \
|
||||
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
|
||||
-DCMAKE_INSTALL_INCLUDEDIR=$TP_INCLUDE_DIR/snappy \
|
||||
-DSNAPPY_BUILD_TESTS=0 ../
|
||||
${BUILD_SYSTEM} -j$PARALLEL
|
||||
|
|
@ -1275,8 +1275,8 @@ build_benchmark() {
|
|||
cd $BUILD_DIR
|
||||
rm -rf CMakeCache.txt CMakeFiles/
|
||||
# https://github.com/google/benchmark/issues/773
|
||||
cmake -DBENCHMARK_DOWNLOAD_DEPENDENCIES=off \
|
||||
-DBENCHMARK_ENABLE_GTEST_TESTS=off \
|
||||
cmake -DBENCHMARK_DOWNLOAD_DEPENDENCIES=OFF \
|
||||
-DBENCHMARK_ENABLE_GTEST_TESTS=OFF \
|
||||
-DCMAKE_INSTALL_PREFIX=$TP_INSTALL_DIR \
|
||||
-DCMAKE_INSTALL_LIBDIR=lib64 \
|
||||
-DRUN_HAVE_STD_REGEX=0 \
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ download_func() {
|
|||
rm -f "$DESC_DIR/$FILENAME"
|
||||
else
|
||||
echo "Downloading $FILENAME from $DOWNLOAD_URL to $DESC_DIR"
|
||||
wget --no-check-certificate $DOWNLOAD_URL -O $DESC_DIR/$FILENAME
|
||||
wget --progress=dot:mega --tries=3 --no-check-certificate $DOWNLOAD_URL -O $DESC_DIR/$FILENAME
|
||||
if [ "$?"x == "0"x ]; then
|
||||
if md5sum_func $FILENAME $DESC_DIR $MD5SUM; then
|
||||
SUCCESS=1
|
||||
|
|
@ -203,14 +203,14 @@ do
|
|||
exit 1
|
||||
fi
|
||||
elif [[ "${!NAME}" =~ $SUFFIX_ZIP ]]; then
|
||||
if ! $UNZIP_CMD "$TP_SOURCE_DIR/${!NAME}" -d $TP_SOURCE_DIR/tmp_dir; then
|
||||
if ! $UNZIP_CMD -q "$TP_SOURCE_DIR/${!NAME}" -d $TP_SOURCE_DIR/tmp_dir; then
|
||||
echo "Failed to unzip ${!NAME}"
|
||||
exit 1
|
||||
fi
|
||||
elif [[ "${!NAME}" =~ $SUFFIX_BZ2 ]]; then
|
||||
echo "$TP_SOURCE_DIR/${!NAME}"
|
||||
echo "$TP_SOURCE_DIR/${!SOURCE}"
|
||||
if ! $TAR_CMD jxvf "$TP_SOURCE_DIR/${!NAME}" -C $TP_SOURCE_DIR/tmp_dir; then
|
||||
if ! $TAR_CMD xjf "$TP_SOURCE_DIR/${!NAME}" -C $TP_SOURCE_DIR/tmp_dir; then
|
||||
echo "Failed to untar ${!NAME}"
|
||||
exit 1
|
||||
fi
|
||||
|
|
@ -420,6 +420,8 @@ fi
|
|||
cd $TP_SOURCE_DIR/$AWS_SDK_CPP_SOURCE
|
||||
if [ $AWS_SDK_CPP_SOURCE = "aws-sdk-cpp-1.11.267" ]; then
|
||||
if [ ! -f prefetch_crt_dep_ok ]; then
|
||||
# make prefetch_crt_dependency.sh less chatty
|
||||
patch -p1 < $TP_PATCH_DIR/aws-cpp-sdk-1.11.267-quiet-unzip-dependencies.patch || true
|
||||
bash ./prefetch_crt_dependency.sh
|
||||
touch prefetch_crt_dep_ok
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
diff --git a/prefetch_crt_dependency.sh b/prefetch_crt_dependency.sh
|
||||
index e7b2f94631e..54a179f2732 100755
|
||||
--- a/prefetch_crt_dependency.sh
|
||||
+++ b/prefetch_crt_dependency.sh
|
||||
@@ -26,7 +26,7 @@ rm -rf crt
|
||||
echo "Downloading and expanding CRT CPP"
|
||||
mkdir -p crt/tmp
|
||||
curl ${CRT_URI} --output crt/tmp/crt.zip
|
||||
-unzip crt/tmp/crt -d crt
|
||||
+unzip -q crt/tmp/crt -d crt
|
||||
CRT_DIR_TMP=`ls -d crt/aws-crt-cpp*`
|
||||
mv ${CRT_DIR_TMP} crt/aws-crt-cpp
|
||||
|
||||
@@ -47,7 +47,7 @@ curl ${S2N_URI} --output crt/tmp/13.zip
|
||||
|
||||
|
||||
for a in `seq 1 13`; do
|
||||
- unzip crt/tmp/${a} -d crt/tmp
|
||||
+ unzip -q crt/tmp/${a} -d crt/tmp
|
||||
done
|
||||
|
||||
rm -rf crt/aws-crt-cpp/crt
|
||||
Loading…
Reference in New Issue