Skip to content

Commit da28238

Browse files
committed
Use archive
1 parent 7fda881 commit da28238

File tree

1 file changed

+20
-7
lines changed

1 file changed

+20
-7
lines changed

cpp/cmake_modules/ThirdpartyToolchain.cmake

+20-7
Original file line numberDiff line numberDiff line change
@@ -5057,14 +5057,20 @@ include(AWSSDKVariables)
50575057
function(build_awssdk)
50585058
message(STATUS "Building AWS SDK for C++ from source")
50595059

5060-
set(AWSSDK_PRODUCTS aws-c-common aws-checksums)
5060+
# aws-c-common must be the first product because others depend on
5061+
# this.
5062+
set(AWSSDK_PRODUCTS aws-c-common)
50615063
# aws-lc and s2n-tls only needed on Linux.
50625064
# We can use LINUX with CMake 3.25 or later.
50635065
if(UNIX AND NOT APPLE)
50645066
list(APPEND AWSSDK_PRODUCTS aws-lc s2n-tls)
50655067
endif()
5068+
list(APPEND AWSSDK_PRODUCTS aws-checksums)
50665069
list(APPEND
50675070
AWSSDK_PRODUCTS
5071+
# We can't sort this in alphabetical order because some
5072+
# products depend on other products.
5073+
aws-checksums
50685074
aws-c-cal
50695075
aws-c-io
50705076
aws-c-event-stream
@@ -5098,13 +5104,20 @@ function(build_awssdk)
50985104
set(${BASE_VARIABLE_NAME}_PATCH_COMMAND
50995105
${CMAKE_COMMAND} -E rm tests/features/S2N_LIBCRYPTO_SUPPORTS_ENGINE.c)
51005106
endif()
5107+
# We can use released archive when v1.15.12 is released.
5108+
fetchcontent_declare(${AWSSDK_PRODUCT}
5109+
${FC_DECLARE_COMMON_OPTIONS} OVERRIDE_FIND_PACKAGE
5110+
PATCH_COMMAND ${${BASE_VARIABLE_NAME}_PATCH_COMMAND}
5111+
URL https://github.com/aws/s2n-tls/archive/7c0291809ad58b3b818b128d97c19c71ff3e10e1.zip
5112+
URL_HASH "SHA256=1ca1fb0a82642a93ab7c95c5a6c9ff80e3388e387fba03153186426b98d8b9e0"
5113+
)
5114+
else()
5115+
fetchcontent_declare(${AWSSDK_PRODUCT}
5116+
${FC_DECLARE_COMMON_OPTIONS} OVERRIDE_FIND_PACKAGE
5117+
URL ${${BASE_VARIABLE_NAME}_SOURCE_URL}
5118+
URL_HASH "SHA256=${ARROW_${BASE_VARIABLE_NAME}_BUILD_SHA256_CHECKSUM}"
5119+
)
51015120
endif()
5102-
fetchcontent_declare(${AWSSDK_PRODUCT}
5103-
${FC_DECLARE_COMMON_OPTIONS} OVERRIDE_FIND_PACKAGE
5104-
PATCH_COMMAND ${${BASE_VARIABLE_NAME}_PATCH_COMMAND}
5105-
URL ${${BASE_VARIABLE_NAME}_SOURCE_URL}
5106-
URL_HASH "SHA256=${ARROW_${BASE_VARIABLE_NAME}_BUILD_SHA256_CHECKSUM}"
5107-
)
51085121
endforeach()
51095122

51105123
prepare_fetchcontent()

0 commit comments

Comments
 (0)