This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new ba0161c8b93 Revert "[feature-wip](Cloud) Introduce azure core C++ sdk
(#35208)" (#35826)
ba0161c8b93 is described below
commit ba0161c8b93aceef26eb8649133296bd5488b575
Author: AlexYue <[email protected]>
AuthorDate: Mon Jun 3 23:22:56 2024 +0800
Revert "[feature-wip](Cloud) Introduce azure core C++ sdk (#35208)" (#35826)
## Proposed changes
Issue Number: close #xxx
<!--Describe your changes.-->
This reverts commit #35641 because of the compilation of such is not
successful on arm plateform.
---
thirdparty/CHANGELOG.md | 4 ----
thirdparty/build-thirdparty.sh | 20 --------------------
thirdparty/vars.sh | 7 -------
3 files changed, 31 deletions(-)
diff --git a/thirdparty/CHANGELOG.md b/thirdparty/CHANGELOG.md
index 5aac13eb301..dd04eb07bfe 100644
--- a/thirdparty/CHANGELOG.md
+++ b/thirdparty/CHANGELOG.md
@@ -2,10 +2,6 @@
This file contains version of the third-party dependency libraries in the
build-env image. The docker build-env image is apache/doris, and the tag is
`build-env-${version}`
-## 20240529
-
-- Added: azure-core 1.10.3
-
## 20240325
- Modified: arrow 13.0.0 -> 15.0.2
diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index 78491966a56..f17af7571bb 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -1778,25 +1778,6 @@ build_base64() {
"${BUILD_SYSTEM}" install
}
-# azure blob storage
-build_azure() {
- check_if_source_exist "${AZURE_SOURCE}"
- cd "${TP_SOURCE_DIR}/${AZURE_SOURCE}"
- azure_dir=$(pwd)
-
- rm -rf "${BUILD_DIR}"
- mkdir -p "${BUILD_DIR}"
- cd "${BUILD_DIR}"
-
- # We need use openssl 1.1.1n, which is already carried in
vcpkg-custom-ports
- AZURE_PORTS="vcpkg-custom-ports"
- AZURE_MANIFEST_DIR="."
-
- "${CMAKE_CMD}" -G "${GENERATOR}" -DVCPKG_MANIFEST_MODE=ON
-DVCPKG_OVERLAY_PORTS="${azure_dir}/${AZURE_PORTS}"
-DVCPKG_MANIFEST_DIR="${azure_dir}/${AZURE_MANIFEST_DIR}"
-DWARNINGS_AS_ERRORS=FALSE -DCMAKE_INSTALL_PREFIX="${TP_INSTALL_DIR}"
-DCMAKE_BUILD_TYPE=Release ..
- "${BUILD_SYSTEM}" -j "${PARALLEL}"
- "${BUILD_SYSTEM}" install
-}
-
if [[ "${#packages[@]}" -eq 0 ]]; then
packages=(
libunixodbc
@@ -1863,7 +1844,6 @@ if [[ "${#packages[@]}" -eq 0 ]]; then
streamvbyte
ali_sdk
base64
- azure
)
if [[ "$(uname -s)" == 'Darwin' ]]; then
read -r -a packages <<<"binutils gettext ${packages[*]}"
diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh
index 0c9113ab8fe..ff8092dba66 100644
--- a/thirdparty/vars.sh
+++ b/thirdparty/vars.sh
@@ -508,12 +508,6 @@ BASE64_NAME="v0.5.2.tar.gz"
BASE64_SOURCE="base64-0.5.2"
BASE64_MD5SUM="49e5a6c98bd0192aedd16c16eec39974"
-# azure blob
-AZURE_DOWNLOAD="https://github.com/Azure/azure-sdk-for-cpp/archive/azure-core_1.10.3.tar.gz";
-AZURE_NAME="azure-core_1.10.3.tar.gz"
-AZURE_SOURCE="azure-sdk-for-cpp-azure-core_1.10.3"
-AZURE_MD5SUM="aa470cfdba93dd69a6f3112a6958c13c"
-
# all thirdparties which need to be downloaded is set in array TP_ARCHIVES
export TP_ARCHIVES=(
'LIBEVENT'
@@ -589,7 +583,6 @@ export TP_ARCHIVES=(
'LIBUUID'
'ALI_SDK'
'BASE64'
- 'AZURE'
)
if [[ "$(uname -s)" == 'Darwin' ]]; then
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
