Skip to content

Commit d2b4036

Browse files
authored
GH-47291: [C++] Update bundled aws-c-common to 0.12.4 (#47292)
### Rationale for this change We can remove a patch by updating to aws-c-common 0.12.4. ### What changes are included in this PR? Update to 0.12.4 and remove a patch. ### Are these changes tested? Yes. ### Are there any user-facing changes? No. * GitHub Issue: #47291 Authored-by: Sutou Kouhei <[email protected]> Signed-off-by: Sutou Kouhei <[email protected]>
1 parent 2b8db00 commit d2b4036

File tree

3 files changed

+2
-91
lines changed

3 files changed

+2
-91
lines changed

cpp/cmake_modules/ThirdpartyToolchain.cmake

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5067,14 +5067,8 @@ function(build_awssdk)
50675067
# AWS-C-CAL ->
50685068
# AWS_C_CAL
50695069
string(REGEX REPLACE "-" "_" BASE_VARIABLE_NAME "${BASE_VARIABLE_NAME}")
5070-
if(MINGW AND AWSSDK_PRODUCT STREQUAL "aws-c-common")
5071-
find_program(PATCH patch REQUIRED)
5072-
set(${BASE_VARIABLE_NAME}_PATCH_COMMAND
5073-
${PATCH} -p1 -i ${CMAKE_CURRENT_LIST_DIR}/aws-c-common-1208.patch)
5074-
endif()
50755070
fetchcontent_declare(${AWSSDK_PRODUCT}
50765071
${FC_DECLARE_COMMON_OPTIONS} OVERRIDE_FIND_PACKAGE
5077-
PATCH_COMMAND ${${BASE_VARIABLE_NAME}_PATCH_COMMAND}
50785072
URL ${${BASE_VARIABLE_NAME}_SOURCE_URL}
50795073
URL_HASH "SHA256=${ARROW_${BASE_VARIABLE_NAME}_BUILD_SHA256_CHECKSUM}"
50805074
)

cpp/cmake_modules/aws-c-common-1208.patch

Lines changed: 0 additions & 83 deletions
This file was deleted.

cpp/thirdparty/versions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ ARROW_AWS_C_AUTH_BUILD_VERSION=v0.9.0
2929
ARROW_AWS_C_AUTH_BUILD_SHA256_CHECKSUM=aa6e98864fefb95c249c100da4ae7aed36ba13a8a91415791ec6fad20bec0427
3030
ARROW_AWS_C_CAL_BUILD_VERSION=v0.9.2
3131
ARROW_AWS_C_CAL_BUILD_SHA256_CHECKSUM=f9f3bc6a069e2efe25fcdf73e4d2b16b5608c327d2eb57c8f7a8524e9e1fcad0
32-
ARROW_AWS_C_COMMON_BUILD_VERSION=v0.12.3
33-
ARROW_AWS_C_COMMON_BUILD_SHA256_CHECKSUM=a4e7ac6c6f840cb6ab56b8ee0bcd94a61c59d68ca42570bca518432da4c94273
32+
ARROW_AWS_C_COMMON_BUILD_VERSION=v0.12.4
33+
ARROW_AWS_C_COMMON_BUILD_SHA256_CHECKSUM=0b7705a4d115663c3f485d353a75ed86e37583157585e5825d851af634b57fe3
3434
ARROW_AWS_C_COMPRESSION_BUILD_VERSION=v0.3.1
3535
ARROW_AWS_C_COMPRESSION_BUILD_SHA256_CHECKSUM=d89fca17a37de762dc34f332d2da402343078da8dbd2224c46a11a88adddf754
3636
ARROW_AWS_C_EVENT_STREAM_BUILD_VERSION=v0.5.4

0 commit comments

Comments
 (0)