This is an automated email from the ASF dual-hosted git repository.
kou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/main by this push:
new d2b4036480 GH-47291: [C++] Update bundled aws-c-common to 0.12.4
(#47292)
d2b4036480 is described below
commit d2b403648061704f55d7b97d24113185b7df8984
Author: Sutou Kouhei <[email protected]>
AuthorDate: Tue Aug 12 11:14:24 2025 +0900
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]>
---
cpp/cmake_modules/ThirdpartyToolchain.cmake | 6 ---
cpp/cmake_modules/aws-c-common-1208.patch | 83 -----------------------------
cpp/thirdparty/versions.txt | 4 +-
3 files changed, 2 insertions(+), 91 deletions(-)
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake
b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 219c2393ce..1a03e7776e 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -5067,14 +5067,8 @@ function(build_awssdk)
# AWS-C-CAL ->
# AWS_C_CAL
string(REGEX REPLACE "-" "_" BASE_VARIABLE_NAME "${BASE_VARIABLE_NAME}")
- if(MINGW AND AWSSDK_PRODUCT STREQUAL "aws-c-common")
- find_program(PATCH patch REQUIRED)
- set(${BASE_VARIABLE_NAME}_PATCH_COMMAND
- ${PATCH} -p1 -i ${CMAKE_CURRENT_LIST_DIR}/aws-c-common-1208.patch)
- endif()
fetchcontent_declare(${AWSSDK_PRODUCT}
${FC_DECLARE_COMMON_OPTIONS} OVERRIDE_FIND_PACKAGE
- PATCH_COMMAND ${${BASE_VARIABLE_NAME}_PATCH_COMMAND}
URL ${${BASE_VARIABLE_NAME}_SOURCE_URL}
URL_HASH
"SHA256=${ARROW_${BASE_VARIABLE_NAME}_BUILD_SHA256_CHECKSUM}"
)
diff --git a/cpp/cmake_modules/aws-c-common-1208.patch
b/cpp/cmake_modules/aws-c-common-1208.patch
deleted file mode 100644
index 72a5f70776..0000000000
--- a/cpp/cmake_modules/aws-c-common-1208.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-From 06c435c6765833734c62ac45909b5ab1fc5276a7 Mon Sep 17 00:00:00 2001
-From: Sutou Kouhei <[email protected]>
-Date: Sat, 7 Jun 2025 20:40:36 +0900
-Subject: [PATCH] Use _WIN32 not _MSC_VER for MinGW
-
-This was missed in https://github.com/awslabs/aws-c-common/pull/801
-and https://github.com/awslabs/aws-c-common/pull/822 .
-
-MSYS2 also includes this change:
-https://github.com/msys2/MINGW-packages/blob/master/mingw-w64-aws-c-common/001-fix-build-on-mingw-aarch64.patch
-
-Error message without this:
-
-https://github.com/ursacomputing/crossbow/actions/runs/15502494926/job/43652596580#step:7:5884
-
- cd /D/a/crossbow/crossbow/src/build-i686-cpp/_deps/aws-c-common-build &&
/D/a/crossbow/crossbow/sccache/sccache.exe /C/rtools40/mingw32/bin/cc.exe
-DARROW_HAVE_RUNTIME_SSE4_2 -DARROW_HAVE_SSE4_2 -DARROW_WITH_TIMING_TESTS
-DAWS_AFFINITY_METHOD=AWS_AFFINITY_METHOD_NONE -DCJSON_HIDE_SYMBOLS
-DINTEL_NO_ITTNOTIFY_API -DPSAPI_VERSION=1 -DWINDOWS_KERNEL_LIB=kernel32
-D_CRT_SECURE_NO_WARNINGS @CMakeFiles/aws-c-common.dir/includes_C.rsp -O3
-DNDEBUG -O2 -ftree-vectorize -std=gnu99 -fvisibil [...]
- In file included from
D:/a/crossbow/crossbow/src/build-i686-cpp/_deps/aws-c-common-src/include/aws/common/byte_order.h:71,
- from
D:/a/crossbow/crossbow/src/build-i686-cpp/_deps/aws-c-common-src/include/aws/common/byte_buf.h:9,
- from
D:/a/crossbow/crossbow/src/build-i686-cpp/_deps/aws-c-common-src/include/aws/common/thread.h:8,
- from
D:/a/crossbow/crossbow/src/build-i686-cpp/_deps/aws-c-common-src/include/aws/common/logging.h:11,
- from
D:/a/crossbow/crossbow/src/build-i686-cpp/_deps/aws-c-common-src/source/allocator.c:8:
-
D:/a/crossbow/crossbow/src/build-i686-cpp/_deps/aws-c-common-src/include/aws/common/byte_order.inl:
In function 'aws_hton64':
-
D:/a/crossbow/crossbow/src/build-i686-cpp/_deps/aws-c-common-src/include/aws/common/byte_order.inl:47:23:
warning: implicit declaration of function 'htonl'; did you mean 'wtoll'?
[-Wimplicit-function-declaration]
- return ((uint64_t)htonl(low)) << 32 | htonl(high);
- ^~~~~
- wtoll
- In file included from
C:/rtools40/mingw32/i686-w64-mingw32/include/windows.h:92,
- from
D:/a/crossbow/crossbow/src/build-i686-cpp/_deps/aws-c-common-src/source/allocator.c:15:
- C:/rtools40/mingw32/i686-w64-mingw32/include/winsock.h: At top level:
- C:/rtools40/mingw32/i686-w64-mingw32/include/winsock.h:286:37: error:
conflicting types for 'htonl'
- WINSOCK_API_LINKAGE u_long WSAAPI htonl(u_long hostlong);
- ^~~~~
- In file included from
D:/a/crossbow/crossbow/src/build-i686-cpp/_deps/aws-c-common-src/include/aws/common/byte_order.h:71,
- from
D:/a/crossbow/crossbow/src/build-i686-cpp/_deps/aws-c-common-src/include/aws/common/byte_buf.h:9,
- from
D:/a/crossbow/crossbow/src/build-i686-cpp/_deps/aws-c-common-src/include/aws/common/thread.h:8,
- from
D:/a/crossbow/crossbow/src/build-i686-cpp/_deps/aws-c-common-src/include/aws/common/logging.h:11,
- from
D:/a/crossbow/crossbow/src/build-i686-cpp/_deps/aws-c-common-src/source/allocator.c:8:
-
D:/a/crossbow/crossbow/src/build-i686-cpp/_deps/aws-c-common-src/include/aws/common/byte_order.inl:47:23:
note: previous implicit declaration of 'htonl' was here
- return ((uint64_t)htonl(low)) << 32 | htonl(high);
- ^~~~~
----
- include/aws/common/byte_order.inl | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/aws/common/byte_order.inl
b/include/aws/common/byte_order.inl
-index 1204be06a1..0abd9cb8cd 100644
---- a/include/aws/common/byte_order.inl
-+++ b/include/aws/common/byte_order.inl
-@@ -13,7 +13,7 @@
- # include <stdlib.h>
- #else
- # include <netinet/in.h>
--#endif /* _MSC_VER */
-+#endif /* _WIN32 */
-
- AWS_EXTERN_C_BEGIN
-
-@@ -39,7 +39,7 @@ AWS_STATIC_IMPL uint64_t aws_hton64(uint64_t x) {
- uint64_t v;
- __asm__("bswap %q0" : "=r"(v) : "0"(x));
- return v;
--#elif defined(_MSC_VER)
-+#elif defined(_WIN32)
- return _byteswap_uint64(x);
- #else
- uint32_t low = x & UINT32_MAX;
diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt
index ef3d6ee9e9..2504e6fd3d 100644
--- a/cpp/thirdparty/versions.txt
+++ b/cpp/thirdparty/versions.txt
@@ -29,8 +29,8 @@ ARROW_AWS_C_AUTH_BUILD_VERSION=v0.9.0
ARROW_AWS_C_AUTH_BUILD_SHA256_CHECKSUM=aa6e98864fefb95c249c100da4ae7aed36ba13a8a91415791ec6fad20bec0427
ARROW_AWS_C_CAL_BUILD_VERSION=v0.9.2
ARROW_AWS_C_CAL_BUILD_SHA256_CHECKSUM=f9f3bc6a069e2efe25fcdf73e4d2b16b5608c327d2eb57c8f7a8524e9e1fcad0
-ARROW_AWS_C_COMMON_BUILD_VERSION=v0.12.3
-ARROW_AWS_C_COMMON_BUILD_SHA256_CHECKSUM=a4e7ac6c6f840cb6ab56b8ee0bcd94a61c59d68ca42570bca518432da4c94273
+ARROW_AWS_C_COMMON_BUILD_VERSION=v0.12.4
+ARROW_AWS_C_COMMON_BUILD_SHA256_CHECKSUM=0b7705a4d115663c3f485d353a75ed86e37583157585e5825d851af634b57fe3
ARROW_AWS_C_COMPRESSION_BUILD_VERSION=v0.3.1
ARROW_AWS_C_COMPRESSION_BUILD_SHA256_CHECKSUM=d89fca17a37de762dc34f332d2da402343078da8dbd2224c46a11a88adddf754
ARROW_AWS_C_EVENT_STREAM_BUILD_VERSION=v0.5.4
