diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index 1e7840cf92e08..75ccb42d71a46 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -2802,8 +2802,8 @@ macro(build_absl) hash hashtablez_sampler int128 + kernel_timeout_internal leak_check - leak_check_disable log_severity low_level_hash malloc_internal @@ -2835,7 +2835,7 @@ macro(build_absl) throw_delegate time time_zone - wyhash) + ) # Abseil creates a number of header-only targets, which are needed to resolve dependencies. # The list can be refreshed using: # comm -13 <(ls -l $PREFIX/lib/libabsl_*.a | sed -e 's/.*libabsl_//' -e 's/.a$//' | sort -u) \ @@ -2844,14 +2844,17 @@ macro(build_absl) algorithm algorithm_container any + any_invocable atomic_hook bad_any_cast base_internal bind_front bits btree + check cleanup cleanup_internal + common_policy_traits compare compressed_tuple config @@ -2876,24 +2879,40 @@ macro(build_absl) hash_policy_traits hashtable_debug hashtable_debug_hooks - have_sse + if_constexpr inlined_vector inlined_vector_internal - kernel_timeout_internal layout + log + log_internal_append_truncated + log_internal_check_impl + log_internal_config + log_internal_flags + log_internal_log_impl + log_internal_nullstream + log_internal_strip + log_internal_structured + log_internal_voidify + log_sink_registry + log_streamer + log_structured memory meta node_hash_map - node_hash_policy node_hash_set + node_slot_policy + non_temporal_arm_intrinsics + non_temporal_memcpy + nullability numeric numeric_representation optional + prefetch pretty_function random_bit_gen_ref random_internal_distribution_caller - random_internal_fast_uniform_bits random_internal_fastmath + random_internal_fast_uniform_bits random_internal_generate_real random_internal_iostream_state_saver random_internal_mock_helpers @@ -2937,10 +2956,18 @@ macro(build_absl) # -e 's/absl_/absl::/g' \ # -e 's/$/)/' | \ # grep -v 'INTERFACE_LINK_LIBRARIES[ ]*)' - set_property(TARGET absl::algorithm PROPERTY INTERFACE_LINK_LIBRARIES absl::config) + set_property(TARGET absl::algorithm_container PROPERTY INTERFACE_LINK_LIBRARIES absl::algorithm absl::core_headers absl::meta) + set_property(TARGET absl::algorithm PROPERTY INTERFACE_LINK_LIBRARIES absl::config) + set_property(TARGET absl::any_invocable + PROPERTY INTERFACE_LINK_LIBRARIES + absl::base_internal + absl::config + absl::core_headers + absl::type_traits + absl::utility) set_property(TARGET absl::any PROPERTY INTERFACE_LINK_LIBRARIES absl::bad_any_cast @@ -2951,14 +2978,16 @@ macro(build_absl) absl::utility) set_property(TARGET absl::atomic_hook PROPERTY INTERFACE_LINK_LIBRARIES absl::config absl::core_headers) - set_property(TARGET absl::bad_any_cast PROPERTY INTERFACE_LINK_LIBRARIES - absl::bad_any_cast_impl absl::config) set_property(TARGET absl::bad_any_cast_impl PROPERTY INTERFACE_LINK_LIBRARIES absl::config absl::raw_logging_internal) + set_property(TARGET absl::bad_any_cast PROPERTY INTERFACE_LINK_LIBRARIES + absl::bad_any_cast_impl absl::config) set_property(TARGET absl::bad_optional_access PROPERTY INTERFACE_LINK_LIBRARIES absl::config absl::raw_logging_internal) set_property(TARGET absl::bad_variant_access PROPERTY INTERFACE_LINK_LIBRARIES absl::config absl::raw_logging_internal) + set_property(TARGET absl::base_internal PROPERTY INTERFACE_LINK_LIBRARIES absl::config + absl::type_traits) set_property(TARGET absl::base PROPERTY INTERFACE_LINK_LIBRARIES absl::atomic_hook @@ -2970,8 +2999,6 @@ macro(build_absl) absl::raw_logging_internal absl::spinlock_wait absl::type_traits) - set_property(TARGET absl::base_internal PROPERTY INTERFACE_LINK_LIBRARIES absl::config - absl::type_traits) set_property(TARGET absl::bind_front PROPERTY INTERFACE_LINK_LIBRARIES absl::base_internal absl::compressed_tuple) @@ -2986,18 +3013,19 @@ macro(build_absl) absl::core_headers absl::layout absl::memory + absl::raw_logging_internal absl::strings absl::throw_delegate absl::type_traits absl::utility) set_property(TARGET absl::city PROPERTY INTERFACE_LINK_LIBRARIES absl::config absl::core_headers absl::endian) - set_property(TARGET absl::cleanup - PROPERTY INTERFACE_LINK_LIBRARIES absl::cleanup_internal absl::config - absl::core_headers) set_property(TARGET absl::cleanup_internal PROPERTY INTERFACE_LINK_LIBRARIES absl::base_internal absl::core_headers absl::utility) + set_property(TARGET absl::cleanup + PROPERTY INTERFACE_LINK_LIBRARIES absl::cleanup_internal absl::config + absl::core_headers) set_property(TARGET absl::compare PROPERTY INTERFACE_LINK_LIBRARIES absl::core_headers absl::type_traits) set_property(TARGET absl::compressed_tuple PROPERTY INTERFACE_LINK_LIBRARIES @@ -3010,6 +3038,19 @@ macro(build_absl) absl::memory absl::type_traits absl::utility) + set_property(TARGET absl::cord_internal + PROPERTY INTERFACE_LINK_LIBRARIES + absl::base_internal + absl::compressed_tuple + absl::config + absl::core_headers + absl::endian + absl::inlined_vector + absl::layout + absl::raw_logging_internal + absl::strings + absl::throw_delegate + absl::type_traits) set_property(TARGET absl::cord PROPERTY INTERFACE_LINK_LIBRARIES absl::base @@ -3026,21 +3067,9 @@ macro(build_absl) absl::inlined_vector absl::optional absl::raw_logging_internal + absl::span absl::strings absl::type_traits) - set_property(TARGET absl::cord_internal - PROPERTY INTERFACE_LINK_LIBRARIES - absl::base_internal - absl::compressed_tuple - absl::config - absl::core_headers - absl::endian - absl::inlined_vector - absl::layout - absl::raw_logging_internal - absl::strings - absl::throw_delegate - absl::type_traits) set_property(TARGET absl::cordz_functions PROPERTY INTERFACE_LINK_LIBRARIES absl::config @@ -3089,8 +3118,6 @@ macro(build_absl) set_property(TARGET absl::core_headers PROPERTY INTERFACE_LINK_LIBRARIES absl::config) set_property(TARGET absl::counting_allocator PROPERTY INTERFACE_LINK_LIBRARIES absl::config) - set_property(TARGET absl::debugging PROPERTY INTERFACE_LINK_LIBRARIES absl::stacktrace - absl::leak_check) set_property(TARGET absl::debugging_internal PROPERTY INTERFACE_LINK_LIBRARIES absl::core_headers @@ -3098,6 +3125,8 @@ macro(build_absl) absl::dynamic_annotations absl::errno_saver absl::raw_logging_internal) + set_property(TARGET absl::debugging PROPERTY INTERFACE_LINK_LIBRARIES absl::stacktrace + absl::leak_check) set_property(TARGET absl::demangle_internal PROPERTY INTERFACE_LINK_LIBRARIES absl::base absl::core_headers) set_property(TARGET absl::dynamic_annotations PROPERTY INTERFACE_LINK_LIBRARIES @@ -3121,7 +3150,6 @@ macro(build_absl) absl::base absl::config absl::core_headers - absl::errno_saver absl::raw_logging_internal) set_property(TARGET absl::fast_type_id PROPERTY INTERFACE_LINK_LIBRARIES absl::config) set_property(TARGET absl::fixed_array @@ -3133,16 +3161,9 @@ macro(build_absl) absl::dynamic_annotations absl::throw_delegate absl::memory) - set_property(TARGET absl::flags - PROPERTY INTERFACE_LINK_LIBRARIES - absl::config - absl::flags_commandlineflag - absl::flags_config - absl::flags_internal - absl::flags_reflection - absl::base - absl::core_headers - absl::strings) + set_property(TARGET absl::flags_commandlineflag_internal + PROPERTY INTERFACE_LINK_LIBRARIES absl::config absl::dynamic_annotations + absl::fast_type_id) set_property(TARGET absl::flags_commandlineflag PROPERTY INTERFACE_LINK_LIBRARIES absl::config @@ -3150,8 +3171,6 @@ macro(build_absl) absl::flags_commandlineflag_internal absl::optional absl::strings) - set_property(TARGET absl::flags_commandlineflag_internal - PROPERTY INTERFACE_LINK_LIBRARIES absl::config absl::fast_type_id) set_property(TARGET absl::flags_config PROPERTY INTERFACE_LINK_LIBRARIES absl::config @@ -3176,6 +3195,7 @@ macro(build_absl) absl::config absl::core_headers absl::log_severity + absl::optional absl::strings absl::str_format) set_property(TARGET absl::flags_parse @@ -3195,6 +3215,16 @@ macro(build_absl) absl::synchronization) set_property(TARGET absl::flags_path_util PROPERTY INTERFACE_LINK_LIBRARIES absl::config absl::strings) + set_property(TARGET absl::flags + PROPERTY INTERFACE_LINK_LIBRARIES + absl::config + absl::flags_commandlineflag + absl::flags_config + absl::flags_internal + absl::flags_reflection + absl::base + absl::core_headers + absl::strings) set_property(TARGET absl::flags_private_handle_accessor PROPERTY INTERFACE_LINK_LIBRARIES absl::config @@ -3217,13 +3247,6 @@ macro(build_absl) absl::strings absl::synchronization absl::flat_hash_map) - set_property(TARGET absl::flags_usage - PROPERTY INTERFACE_LINK_LIBRARIES - absl::config - absl::core_headers - absl::flags_usage_internal - absl::strings - absl::synchronization) set_property(TARGET absl::flags_usage_internal PROPERTY INTERFACE_LINK_LIBRARIES absl::config @@ -3238,9 +3261,17 @@ macro(build_absl) absl::flat_hash_map absl::strings absl::synchronization) + set_property(TARGET absl::flags_usage + PROPERTY INTERFACE_LINK_LIBRARIES + absl::config + absl::core_headers + absl::flags_usage_internal + absl::strings + absl::synchronization) set_property(TARGET absl::flat_hash_map PROPERTY INTERFACE_LINK_LIBRARIES absl::container_memory + absl::core_headers absl::hash_function_defaults absl::raw_hash_map absl::algorithm_container @@ -3264,6 +3295,12 @@ macro(build_absl) absl::core_headers absl::malloc_internal absl::raw_logging_internal) + set_property(TARGET absl::hash_function_defaults + PROPERTY INTERFACE_LINK_LIBRARIES + absl::config + absl::cord + absl::hash + absl::strings) set_property(TARGET absl::hash PROPERTY INTERFACE_LINK_LIBRARIES absl::city @@ -3271,6 +3308,7 @@ macro(build_absl) absl::core_headers absl::endian absl::fixed_array + absl::function_ref absl::meta absl::int128 absl::strings @@ -3278,32 +3316,19 @@ macro(build_absl) absl::variant absl::utility absl::low_level_hash) - set_property(TARGET absl::hash_function_defaults - PROPERTY INTERFACE_LINK_LIBRARIES - absl::config - absl::cord - absl::hash - absl::strings) set_property(TARGET absl::hash_policy_traits PROPERTY INTERFACE_LINK_LIBRARIES absl::meta) - set_property(TARGET absl::hashtable_debug PROPERTY INTERFACE_LINK_LIBRARIES - absl::hashtable_debug_hooks) set_property(TARGET absl::hashtable_debug_hooks PROPERTY INTERFACE_LINK_LIBRARIES absl::config) + set_property(TARGET absl::hashtable_debug PROPERTY INTERFACE_LINK_LIBRARIES + absl::hashtable_debug_hooks) set_property(TARGET absl::hashtablez_sampler PROPERTY INTERFACE_LINK_LIBRARIES absl::base + absl::config absl::exponential_biased - absl::have_sse absl::sample_recorder absl::synchronization) - set_property(TARGET absl::inlined_vector - PROPERTY INTERFACE_LINK_LIBRARIES - absl::algorithm - absl::core_headers - absl::inlined_vector_internal - absl::throw_delegate - absl::memory) set_property(TARGET absl::inlined_vector_internal PROPERTY INTERFACE_LINK_LIBRARIES absl::compressed_tuple @@ -3311,6 +3336,13 @@ macro(build_absl) absl::memory absl::span absl::type_traits) + set_property(TARGET absl::inlined_vector + PROPERTY INTERFACE_LINK_LIBRARIES + absl::algorithm + absl::core_headers + absl::inlined_vector_internal + absl::throw_delegate + absl::memory) set_property(TARGET absl::int128 PROPERTY INTERFACE_LINK_LIBRARIES absl::config absl::core_headers absl::bits) set_property(TARGET absl::kernel_timeout_internal @@ -3348,20 +3380,22 @@ macro(build_absl) set_property(TARGET absl::node_hash_map PROPERTY INTERFACE_LINK_LIBRARIES absl::container_memory + absl::core_headers absl::hash_function_defaults - absl::node_hash_policy + absl::node_slot_policy absl::raw_hash_map absl::algorithm_container absl::memory) - set_property(TARGET absl::node_hash_policy PROPERTY INTERFACE_LINK_LIBRARIES - absl::config) set_property(TARGET absl::node_hash_set PROPERTY INTERFACE_LINK_LIBRARIES + absl::core_headers absl::hash_function_defaults - absl::node_hash_policy + absl::node_slot_policy absl::raw_hash_set absl::algorithm_container absl::memory) + set_property(TARGET absl::node_slot_policy PROPERTY INTERFACE_LINK_LIBRARIES + absl::config) set_property(TARGET absl::numeric PROPERTY INTERFACE_LINK_LIBRARIES absl::int128) set_property(TARGET absl::numeric_representation PROPERTY INTERFACE_LINK_LIBRARIES absl::config) @@ -3377,6 +3411,7 @@ macro(build_absl) set_property(TARGET absl::periodic_sampler PROPERTY INTERFACE_LINK_LIBRARIES absl::core_headers absl::exponential_biased) + set_property(TARGET absl::prefetch PROPERTY INTERFACE_LINK_LIBRARIES absl::config) set_property(TARGET absl::random_bit_gen_ref PROPERTY INTERFACE_LINK_LIBRARIES absl::core_headers @@ -3409,10 +3444,10 @@ macro(build_absl) absl::strings absl::str_format absl::span) - set_property(TARGET absl::random_internal_fast_uniform_bits - PROPERTY INTERFACE_LINK_LIBRARIES absl::config) set_property(TARGET absl::random_internal_fastmath PROPERTY INTERFACE_LINK_LIBRARIES absl::bits) + set_property(TARGET absl::random_internal_fast_uniform_bits + PROPERTY INTERFACE_LINK_LIBRARIES absl::config) set_property(TARGET absl::random_internal_generate_real PROPERTY INTERFACE_LINK_LIBRARIES absl::bits @@ -3426,7 +3461,7 @@ macro(build_absl) set_property(TARGET absl::random_internal_nonsecure_base PROPERTY INTERFACE_LINK_LIBRARIES absl::core_headers - absl::optional + absl::inlined_vector absl::random_internal_pool_urbg absl::random_internal_salted_seed_seq absl::random_internal_seed_material @@ -3453,10 +3488,6 @@ macro(build_absl) absl::random_seed_gen_exception absl::raw_logging_internal absl::span) - set_property(TARGET absl::random_internal_randen - PROPERTY INTERFACE_LINK_LIBRARIES absl::random_internal_platform - absl::random_internal_randen_hwaes - absl::random_internal_randen_slow) set_property(TARGET absl::random_internal_randen_engine PROPERTY INTERFACE_LINK_LIBRARIES absl::endian @@ -3464,12 +3495,16 @@ macro(build_absl) absl::random_internal_randen absl::raw_logging_internal absl::type_traits) + set_property(TARGET absl::random_internal_randen_hwaes_impl + PROPERTY INTERFACE_LINK_LIBRARIES absl::random_internal_platform + absl::config) set_property(TARGET absl::random_internal_randen_hwaes PROPERTY INTERFACE_LINK_LIBRARIES absl::random_internal_platform absl::random_internal_randen_hwaes_impl absl::config) - set_property(TARGET absl::random_internal_randen_hwaes_impl + set_property(TARGET absl::random_internal_randen PROPERTY INTERFACE_LINK_LIBRARIES absl::random_internal_platform - absl::config) + absl::random_internal_randen_hwaes + absl::random_internal_randen_slow) set_property(TARGET absl::random_internal_randen_slow PROPERTY INTERFACE_LINK_LIBRARIES absl::random_internal_platform absl::config) @@ -3507,8 +3542,8 @@ macro(build_absl) absl::config) set_property(TARGET absl::random_seed_sequences PROPERTY INTERFACE_LINK_LIBRARIES + absl::config absl::inlined_vector - absl::random_internal_nonsecure_base absl::random_internal_pool_urbg absl::random_internal_salted_seed_seq absl::random_internal_seed_material @@ -3528,10 +3563,10 @@ macro(build_absl) absl::endian absl::hash_policy_traits absl::hashtable_debug_hooks - absl::have_sse absl::memory absl::meta absl::optional + absl::prefetch absl::utility absl::hashtablez_sampler) set_property(TARGET absl::raw_logging_internal @@ -3539,6 +3574,7 @@ macro(build_absl) absl::atomic_hook absl::config absl::core_headers + absl::errno_saver absl::log_severity) set_property(TARGET absl::sample_recorder PROPERTY INTERFACE_LINK_LIBRARIES absl::base absl::synchronization) @@ -3556,20 +3592,6 @@ macro(build_absl) set_property(TARGET absl::stacktrace PROPERTY INTERFACE_LINK_LIBRARIES absl::debugging_internal absl::config absl::core_headers) - set_property(TARGET absl::status - PROPERTY INTERFACE_LINK_LIBRARIES - absl::atomic_hook - absl::config - absl::core_headers - absl::function_ref - absl::raw_logging_internal - absl::inlined_vector - absl::stacktrace - absl::symbolize - absl::strings - absl::cord - absl::str_format - absl::optional) set_property(TARGET absl::statusor PROPERTY INTERFACE_LINK_LIBRARIES absl::base @@ -3580,8 +3602,23 @@ macro(build_absl) absl::strings absl::utility absl::variant) - set_property(TARGET absl::str_format PROPERTY INTERFACE_LINK_LIBRARIES - absl::str_format_internal) + set_property(TARGET absl::status + PROPERTY INTERFACE_LINK_LIBRARIES + absl::atomic_hook + absl::config + absl::cord + absl::core_headers + absl::function_ref + absl::inlined_vector + absl::optional + absl::raw_logging_internal + absl::stacktrace + absl::str_format + absl::strerror + absl::strings + absl::symbolize) + set_property(TARGET absl::strerror PROPERTY INTERFACE_LINK_LIBRARIES absl::config + absl::core_headers absl::errno_saver) set_property(TARGET absl::str_format_internal PROPERTY INTERFACE_LINK_LIBRARIES absl::bits @@ -3590,10 +3627,18 @@ macro(build_absl) absl::core_headers absl::numeric_representation absl::type_traits + absl::utility absl::int128 absl::span) - set_property(TARGET absl::strerror PROPERTY INTERFACE_LINK_LIBRARIES absl::config - absl::core_headers absl::errno_saver) + set_property(TARGET absl::str_format PROPERTY INTERFACE_LINK_LIBRARIES + absl::str_format_internal) + set_property(TARGET absl::strings_internal + PROPERTY INTERFACE_LINK_LIBRARIES + absl::config + absl::core_headers + absl::endian + absl::raw_logging_internal + absl::type_traits) set_property(TARGET absl::strings PROPERTY INTERFACE_LINK_LIBRARIES absl::strings_internal @@ -3607,13 +3652,6 @@ macro(build_absl) absl::raw_logging_internal absl::throw_delegate absl::type_traits) - set_property(TARGET absl::strings_internal - PROPERTY INTERFACE_LINK_LIBRARIES - absl::config - absl::core_headers - absl::endian - absl::raw_logging_internal - absl::type_traits) set_property(TARGET absl::symbolize PROPERTY INTERFACE_LINK_LIBRARIES absl::debugging_internal @@ -3662,9 +3700,6 @@ macro(build_absl) absl::core_headers absl::type_traits absl::utility) - set_property(TARGET absl::wyhash PROPERTY INTERFACE_LINK_LIBRARIES absl::config - absl::endian absl::int128) - if(APPLE) # This is due to upstream absl::cctz issue # https://github.com/abseil/abseil-cpp/issues/283 diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt index c05ff4228462c..495ec4185cba2 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=20230125.3 +ARROW_ABSL_BUILD_SHA256_CHECKSUM=5366d7e7fa7ba0d915014d387b66d0d002c03236448e1ba9ef98122c13b35c36 ARROW_AWS_C_AUTH_BUILD_VERSION=v0.6.22 ARROW_AWS_C_AUTH_BUILD_SHA256_CHECKSUM=691a6b4418afcd3dc141351b6ad33fccd8e3ff84df0e9e045b42295d284ee14c ARROW_AWS_C_CAL_BUILD_VERSION=v0.5.20