From 1b1bbc87e4b0b6dd96414c9822f217264212e0c6 Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Tue, 25 Nov 2025 08:53:59 -0600 Subject: [PATCH 1/3] bump absl version --- cpp/thirdparty/versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt index fd596f9a24d..c2ad0774252 100644 --- a/cpp/thirdparty/versions.txt +++ b/cpp/thirdparty/versions.txt @@ -23,8 +23,8 @@ # `DEPENDENCIES` array (see the comment on top of the declaration for the # format). -ARROW_ABSL_BUILD_VERSION=20211102.0 -ARROW_ABSL_BUILD_SHA256_CHECKSUM=dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4 +ARROW_ABSL_BUILD_VERSION=20250512.1 +ARROW_ABSL_BUILD_SHA256_CHECKSUM=9b7a064305e9fd94d124ffa6cc358592eb42b5da588fb4e07d09254aa40086db 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 From 74d8b9e010cf5530c83dfac62231c3994e794d1d Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Tue, 25 Nov 2025 17:49:33 -0600 Subject: [PATCH 2/3] Swap absl targets --- cpp/cmake_modules/ThirdpartyToolchain.cmake | 37 ++++++++++++++------- 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index 3f381649f5a..d713e60da78 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -3135,10 +3135,7 @@ function(build_absl) # Create a target that depends on ALL Abseil libraries that will be installed. # This ensures they're all built before we try to install. add_custom_target(absl_built - DEPENDS absl::bad_any_cast_impl - absl::bad_optional_access - absl::bad_variant_access - absl::base + DEPENDS absl::base absl::city absl::civil_time absl::cord @@ -3147,8 +3144,14 @@ function(build_absl) absl::cordz_handle absl::cordz_info absl::cordz_sample_token + absl::crc32c + absl::crc_cord_state + absl::crc_cpu_detect + absl::crc_internal absl::debugging_internal + absl::decode_rust_punycode absl::demangle_internal + absl::demangle_rust absl::examine_stack absl::exponential_biased absl::failure_signal_handler @@ -3168,16 +3171,27 @@ function(build_absl) absl::hash absl::hashtablez_sampler absl::int128 + absl::kernel_timeout_internal absl::leak_check - absl::leak_check_disable + absl::log_globals + absl::log_internal_conditions + absl::log_internal_fnmatch + absl::log_internal_format + absl::log_internal_globals + absl::log_internal_log_sink_set + absl::log_internal_nullguard + absl::log_internal_proto + absl::log_internal_structured_proto absl::log_severity + absl::log_sink absl::low_level_hash absl::malloc_internal absl::periodic_sampler + absl::poison absl::random_distributions absl::random_internal_distribution_test_util + absl::random_internal_entropy_pool absl::random_internal_platform - absl::random_internal_pool_urbg absl::random_internal_randen absl::random_internal_randen_hwaes absl::random_internal_randen_hwaes_impl @@ -3194,13 +3208,17 @@ function(build_absl) absl::statusor absl::str_format_internal absl::strerror + absl::string_view absl::strings absl::strings_internal absl::symbolize absl::synchronization absl::throw_delegate absl::time - absl::time_zone) + absl::time_zone + absl::tracing_internal + absl::utf8_for_code_point + absl::vlog_config_internal) # gRPC requires Abseil to be installed to a known location. # We have to do this in two steps to avoid double installation of Abseil @@ -3451,7 +3469,6 @@ macro(build_grpc) absl::low_level_hash absl::random_distributions absl::random_seed_sequences - absl::random_internal_pool_urbg absl::random_internal_randen absl::random_internal_randen_hwaes absl::random_internal_randen_hwaes_impl @@ -3467,7 +3484,6 @@ macro(build_grpc) absl::cordz_functions absl::exponential_biased absl::cordz_handle - absl::bad_optional_access absl::str_format_internal absl::synchronization absl::graphcycles_internal @@ -3485,7 +3501,6 @@ macro(build_grpc) absl::int128 absl::throw_delegate absl::time_zone - absl::bad_variant_access absl::raw_logging_internal absl::log_severity) @@ -3898,8 +3913,6 @@ macro(build_google_cloud_cpp_storage) # (and then some regexing) list(APPEND ARROW_BUNDLED_STATIC_LIBS - absl::bad_optional_access - absl::bad_variant_access absl::base absl::civil_time absl::cord From e7b1eafbc1c54590295135e2edccf72753c51c20 Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Wed, 26 Nov 2025 09:00:14 -0600 Subject: [PATCH 3/3] add more absl::... to vendored list --- cpp/cmake_modules/ThirdpartyToolchain.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index d713e60da78..f860d41329b 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -3920,6 +3920,10 @@ macro(build_google_cloud_cpp_storage) absl::cordz_functions absl::cordz_info absl::cordz_handle + absl::crc32c + absl::crc_cord_state + absl::crc_cpu_detect + absl::crc_internal absl::debugging_internal absl::demangle_internal absl::exponential_biased