This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch dev-1.0.1
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
commit 035006fb6cded49014be8b566b3e4998078b176d
Author: Zhengguo Yang <yangz...@gmail.com>
AuthorDate: Mon Mar 28 09:35:51 2022 +0800
[chore] optimize aws thirdparty package download. (#8637)
---
be/CMakeLists.txt | 33 +++++++++++----------------------
fe/pom.xml | 5 -----
thirdparty/download-thirdparty.sh | 9 +++++++--
3 files changed, 18 insertions(+), 29 deletions(-)
diff --git a/be/CMakeLists.txt b/be/CMakeLists.txt
index cd55f8f..691ca26 100644
--- a/be/CMakeLists.txt
+++ b/be/CMakeLists.txt
@@ -93,26 +93,9 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
endif()
endif()
-set(PIC_LIB_PATH "${THIRDPARTY_DIR}")
-if(PIC_LIB_PATH)
- message(STATUS "defined PIC_LIB_PATH")
- set(CMAKE_SKIP_RPATH TRUE)
- set(Boost_USE_STATIC_LIBS ON)
- set(Boost_USE_STATIC_RUNTIME ON)
- set(LIBBZ2 ${PIC_LIB_PATH}/lib/libbz2.a)
- set(LIBZ ${PIC_LIB_PATH}/lib/libz.a)
- set(LIBEVENT ${PIC_LIB_PATH}/lib/libevent.a)
- set(LIBEVENT_PTHREADS ${PIC_LIB_PATH}/lib/libevent_pthreads.a)
-else()
- message(STATUS "undefined PIC_LIB_PATH")
- set(Boost_USE_STATIC_LIBS ON)
- set(Boost_USE_STATIC_RUNTIME ON)
- set(LIBBZ2 -lbz2)
- set(LIBZ -lz)
- set(LIBEVENT event)
- set(LIBEVENT_PTHREADS libevent_pthreads)
-endif()
-
+set(CMAKE_SKIP_RPATH TRUE)
+set(Boost_USE_STATIC_LIBS ON)
+set(Boost_USE_STATIC_RUNTIME ON)
# Compile generated source if necessary
message(STATUS "build gensrc if necessary")
@@ -206,6 +189,12 @@ set_target_properties(libevent PROPERTIES
IMPORTED_LOCATION ${THIRDPARTY_DIR}/li
add_library(libevent_pthreads STATIC IMPORTED)
set_target_properties(libevent_pthreads PROPERTIES IMPORTED_LOCATION
${THIRDPARTY_DIR}/lib/libevent_pthreads.a)
+add_library(libbz2 STATIC IMPORTED)
+set_target_properties(libbz2 PROPERTIES IMPORTED_LOCATION
${THIRDPARTY_DIR}/lib/libbz2.a)
+
+add_library(libz STATIC IMPORTED)
+set_target_properties(libz PROPERTIES IMPORTED_LOCATION
${THIRDPARTY_DIR}/lib/libz.a)
+
add_library(crypto STATIC IMPORTED)
set_target_properties(crypto PROPERTIES IMPORTED_LOCATION
${THIRDPARTY_DIR}/lib/libcrypto.a)
@@ -549,8 +538,8 @@ set(COMMON_THIRDPARTY
idn
gsasl
curl
- ${LIBZ}
- ${LIBBZ2}
+ libz
+ libbz2
gflags
brpc
protobuf
diff --git a/fe/pom.xml b/fe/pom.xml
index 47423f7..2ac18dd 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -239,11 +239,6 @@ under the License.
<id>cloudera-public</id>
<url>https://repository.cloudera.com/artifactory/public/</url>
</repository>
- <!-- for bdb je -->
- <repository>
- <id>oracleReleases</id>
- <url>https://download.oracle.com/maven</url>
- </repository>
</repositories>
<pluginRepositories>
<!-- for cup-maven-plugin -->
diff --git a/thirdparty/download-thirdparty.sh
b/thirdparty/download-thirdparty.sh
index 74919f3..b17c6be 100755
--- a/thirdparty/download-thirdparty.sh
+++ b/thirdparty/download-thirdparty.sh
@@ -305,8 +305,13 @@ echo "Finished patching $LIBRDKAFKA_SOURCE"
cd $TP_SOURCE_DIR/$AWS_SDK_SOURCE
if [ ! -f $PATCHED_MARK ]; then
if [ $AWS_SDK_SOURCE == "aws-sdk-cpp-1.9.211" ]; then
- wget --no-check-certificate -q
https://doris-thirdparty-repo.bj.bcebos.com/thirdparty/aws-crt-cpp-1.9.211.tar.gz
- tar xzf aws-crt-cpp-1.9.211.tar.gz
+ wget --no-check-certificate -q
https://doris-thirdparty-repo.bj.bcebos.com/thirdparty/aws-crt-cpp-1.9.211.tar.gz
-O aws-crt-cpp-1.9.211.tar.gz
+ ret="$?"
+ if [ $ret -eq 0 ] ; then
+ tar xzf aws-crt-cpp-1.9.211.tar.gz
+ else
+ bash ./prefetch_crt_dependency.sh
+ fi
else
bash ./prefetch_crt_dependency.sh
fi
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
