From f5ebc083dc51a400f86bc26976b2878d2d889bc7 Mon Sep 17 00:00:00 2001 From: Thomas Newton Date: Sat, 26 Aug 2023 13:47:01 +0100 Subject: [PATCH] Use newer Azure SDK with support for older curl --- cpp/cmake_modules/ThirdpartyToolchain.cmake | 1 + cpp/thirdparty/versions.txt | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index 9c830c88dc7a9..7b00344fa8c0c 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -5082,6 +5082,7 @@ function(build_azure_sdk) set(CMAKE_EXPORT_NO_PACKAGE_REGISTRY TRUE) set(DISABLE_AZURE_CORE_OPENTELEMETRY TRUE) set(ENV{AZURE_SDK_DISABLE_AUTO_VCPKG} TRUE) + set(WARNINGS_AS_ERRORS FALSE) # TODO: Configure flags in a better way. FetchContent builds inherit # global flags but we want to disable -Werror for Azure SDK for C++ builds. if(MSVC) diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt index 72a01e51346ed..52d302592b55c 100644 --- a/cpp/thirdparty/versions.txt +++ b/cpp/thirdparty/versions.txt @@ -54,8 +54,8 @@ ARROW_AWS_LC_BUILD_SHA256_CHECKSUM=ae96a3567161552744fc0cae8b4d68ed88b1ec0f3d3c9 ARROW_AWSSDK_BUILD_VERSION=1.10.55 ARROW_AWSSDK_BUILD_SHA256_CHECKSUM=2d552fb1a84bef4a9b65e34aa7031851ed2aef5319e02cc6e4cb735c48aa30de # Despite the confusing version name this is still the whole Azure SDK for C++ including core, keyvault, storage-common, etc. -ARROW_AZURE_SDK_BUILD_VERSION=azure-identity_1.5.1 -ARROW_AZURE_SDK_BUILD_SHA256_CHECKSUM=651a660592540c267420b7e1c8dc98428a17396e45f7f6c92a864ab9a4fa028a +ARROW_AZURE_SDK_BUILD_VERSION=azure-core_1.10.2 +ARROW_AZURE_SDK_BUILD_SHA256_CHECKSUM=36557dae87de4cdd257d9b441d9a7f043290eae6666fb1065e0fa486ae3e58a0 ARROW_BOOST_BUILD_VERSION=1.81.0 ARROW_BOOST_BUILD_SHA256_CHECKSUM=9e0ffae35528c35f90468997bc8d99500bf179cbae355415a89a600c38e13574 ARROW_BROTLI_BUILD_VERSION=v1.0.9