Skip to content

Commit eda8076

Browse files
raulcdraulcd
committed
Try upgrading Abseil, gRPC, Protobuf
1 parent 66e8062 commit eda8076

File tree

2 files changed

+49
-31
lines changed

2 files changed

+49
-31
lines changed

‎cpp/cmake_modules/ThirdpartyToolchain.cmake‎

Lines changed: 42 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ else()
753753
ARROW_PROTOBUF_STRIPPED_BUILD_VERSION)
754754
# strip the leading `v`
755755
set_urls(PROTOBUF_SOURCE_URL
756-
"https://github.com/protocolbuffers/protobuf/releases/download/${ARROW_PROTOBUF_BUILD_VERSION}/protobuf-all-${ARROW_PROTOBUF_STRIPPED_BUILD_VERSION}.tar.gz"
756+
"https://github.com/protocolbuffers/protobuf/releases/download/${ARROW_PROTOBUF_BUILD_VERSION}/protobuf-${ARROW_PROTOBUF_STRIPPED_BUILD_VERSION}.tar.gz"
757757
"${THIRDPARTY_MIRROR_URL}/protobuf-${ARROW_PROTOBUF_BUILD_VERSION}.tar.gz")
758758
endif()
759759

@@ -1884,8 +1884,7 @@ function(build_protobuf)
18841884

18851885
fetchcontent_declare(protobuf
18861886
URL ${PROTOBUF_SOURCE_URL}
1887-
URL_HASH "SHA256=${ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM}"
1888-
SOURCE_SUBDIR cmake)
1887+
URL_HASH "SHA256=${ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM}")
18891888

18901889
prepare_fetchcontent()
18911890

@@ -3060,53 +3059,71 @@ function(build_absl)
30603059
# Create a target that depends on ALL Abseil libraries that will be installed.
30613060
# This ensures they're all built before we try to install.
30623061
add_custom_target(absl_built
3063-
DEPENDS absl::bad_any_cast_impl
3064-
absl::bad_optional_access
3065-
absl::bad_variant_access
3066-
absl::base
3062+
DEPENDS absl::base
30673063
absl::city
30683064
absl::civil_time
3069-
absl::cord
30703065
absl::cord_internal
3066+
absl::cord
30713067
absl::cordz_functions
30723068
absl::cordz_handle
30733069
absl::cordz_info
30743070
absl::cordz_sample_token
3071+
absl::crc_cord_state
3072+
absl::crc_cpu_detect
3073+
absl::crc_internal
3074+
absl::crc32c
30753075
absl::debugging_internal
3076+
absl::decode_rust_punycode
30763077
absl::demangle_internal
3078+
absl::demangle_rust
3079+
absl::die_if_null
30773080
absl::examine_stack
30783081
absl::exponential_biased
30793082
absl::failure_signal_handler
3080-
absl::flags
3081-
absl::flags_commandlineflag
30823083
absl::flags_commandlineflag_internal
3084+
absl::flags_commandlineflag
30833085
absl::flags_config
30843086
absl::flags_internal
30853087
absl::flags_marshalling
30863088
absl::flags_parse
30873089
absl::flags_private_handle_accessor
30883090
absl::flags_program_name
30893091
absl::flags_reflection
3090-
absl::flags_usage
30913092
absl::flags_usage_internal
3093+
absl::flags_usage
30923094
absl::graphcycles_internal
30933095
absl::hash
30943096
absl::hashtablez_sampler
30953097
absl::int128
3098+
absl::kernel_timeout_internal
30963099
absl::leak_check
3097-
absl::leak_check_disable
3100+
absl::log_flags
3101+
absl::log_globals
3102+
absl::log_initialize
3103+
absl::log_internal_check_op
3104+
absl::log_internal_conditions
3105+
absl::log_internal_fnmatch
3106+
absl::log_internal_format
3107+
absl::log_internal_globals
3108+
absl::log_internal_log_sink_set
3109+
absl::log_internal_message
3110+
absl::log_internal_nullguard
3111+
absl::log_internal_proto
3112+
absl::log_internal_structured_proto
30983113
absl::log_severity
3114+
absl::log_sink
30993115
absl::low_level_hash
31003116
absl::malloc_internal
31013117
absl::periodic_sampler
3118+
absl::poison
31023119
absl::random_distributions
31033120
absl::random_internal_distribution_test_util
3121+
absl::random_internal_entropy_pool
31043122
absl::random_internal_platform
3105-
absl::random_internal_pool_urbg
3106-
absl::random_internal_randen
3107-
absl::random_internal_randen_hwaes
31083123
absl::random_internal_randen_hwaes_impl
3124+
absl::random_internal_randen_hwaes
31093125
absl::random_internal_randen_slow
3126+
absl::random_internal_randen
31103127
absl::random_internal_seed_material
31113128
absl::random_seed_gen_exception
31123129
absl::random_seed_sequences
@@ -3119,13 +3136,17 @@ function(build_absl)
31193136
absl::statusor
31203137
absl::str_format_internal
31213138
absl::strerror
3122-
absl::strings
3139+
absl::string_view
31233140
absl::strings_internal
3141+
absl::strings
31243142
absl::symbolize
31253143
absl::synchronization
31263144
absl::throw_delegate
3145+
absl::time_zone
31273146
absl::time
3128-
absl::time_zone)
3147+
absl::tracing_internal
3148+
absl::utf8_for_code_point
3149+
absl::vlog_config_internal)
31293150

31303151
# google-cloud-cpp requires Abseil to be installed to a known location.
31313152
# We have to do this in two steps to avoid double installation of Abseil
@@ -3226,7 +3247,8 @@ function(build_grpc)
32263247

32273248
set(gRPC_SSL_PROVIDER "none")
32283249
set(_gRPC_SSL_LIBRARIES "OpenSSL::SSL;OpenSSL::Crypto")
3229-
set(gRPC_ZLIB_PROVIDER "package")
3250+
set(gRPC_ZLIB_PROVIDER "none")
3251+
set(_gRPC_ZLIB_LIBRARIES "ZLIB::ZLIB")
32303252
set(gRPC_INSTALL OFF)
32313253
set(gRPC_BUILD_TESTS OFF)
32323254

@@ -3251,8 +3273,7 @@ function(build_grpc)
32513273
gpr
32523274
grpc
32533275
grpc++
3254-
grpc++_reflection
3255-
upb)
3276+
grpc++_reflection)
32563277

32573278
foreach(target ${GRPC_LIBRARY_TARGETS})
32583279
if(TARGET ${target} AND NOT TARGET gRPC::${target})
@@ -3300,8 +3321,7 @@ function(build_grpc)
33003321
gRPC::address_sorting
33013322
gRPC::gpr
33023323
gRPC::grpc
3303-
gRPC::grpcpp_for_bundling
3304-
gRPC::upb)
3324+
gRPC::grpcpp_for_bundling)
33053325
set(ARROW_BUNDLED_STATIC_LIBS
33063326
"${ARROW_BUNDLED_STATIC_LIBS}"
33073327
PARENT_SCOPE)
@@ -3636,8 +3656,6 @@ macro(build_google_cloud_cpp_storage)
36363656
# (and then some regexing)
36373657
list(APPEND
36383658
ARROW_BUNDLED_STATIC_LIBS
3639-
absl::bad_optional_access
3640-
absl::bad_variant_access
36413659
absl::base
36423660
absl::civil_time
36433661
absl::cord

‎cpp/thirdparty/versions.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
# `DEPENDENCIES` array (see the comment on top of the declaration for the
2424
# format).
2525

26-
ARROW_ABSL_BUILD_VERSION=20211102.0
27-
ARROW_ABSL_BUILD_SHA256_CHECKSUM=dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4
26+
ARROW_ABSL_BUILD_VERSION=20250512.1
27+
ARROW_ABSL_BUILD_SHA256_CHECKSUM=9b7a064305e9fd94d124ffa6cc358592eb42b5da588fb4e07d09254aa40086db
2828
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
@@ -74,8 +74,8 @@ ARROW_GLOG_BUILD_VERSION=v0.5.0
7474
ARROW_GLOG_BUILD_SHA256_CHECKSUM=eede71f28371bf39aa69b45de23b329d37214016e2055269b3b5e7cfd40b59f5
7575
ARROW_GOOGLE_CLOUD_CPP_BUILD_VERSION=v2.22.0
7676
ARROW_GOOGLE_CLOUD_CPP_BUILD_SHA256_CHECKSUM=0c68782e57959c82e0c81def805c01460a042c1aae0c2feee905acaa2a2dc9bf
77-
ARROW_GRPC_BUILD_VERSION=v1.46.3
78-
ARROW_GRPC_BUILD_SHA256_CHECKSUM=d6cbf22cb5007af71b61c6be316a79397469c58c82a942552a62e708bce60964
77+
ARROW_GRPC_BUILD_VERSION=v1.76.0
78+
ARROW_GRPC_BUILD_SHA256_CHECKSUM=0af37b800953130b47c075b56683ee60bdc3eda3c37fc6004193f5b569758204
7979
ARROW_GTEST_BUILD_VERSION=1.16.0
8080
ARROW_GTEST_BUILD_SHA256_CHECKSUM=78c676fc63881529bf97bf9d45948d905a66833fbfa5318ea2cd7478cb98f399
8181
ARROW_JEMALLOC_BUILD_VERSION=5.3.0
@@ -92,8 +92,8 @@ ARROW_OPENTELEMETRY_PROTO_BUILD_VERSION=v1.7.0
9292
ARROW_OPENTELEMETRY_PROTO_BUILD_SHA256_CHECKSUM=11330d850f5e24d34c4246bc8cb21fcd311e7565d219195713455a576bb11bed
9393
ARROW_ORC_BUILD_VERSION=2.2.1
9494
ARROW_ORC_BUILD_SHA256_CHECKSUM=52fc762332442e8b05d7182f8c035f9e04d945b9a52be22ab69f28b3f37d4500
95-
ARROW_PROTOBUF_BUILD_VERSION=v21.3
96-
ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM=2f723218f6cb709ae4cdc4fb5ed56a5951fc5d466f0128ce4c946b8c78c8c49f
95+
ARROW_PROTOBUF_BUILD_VERSION=v33.1
96+
ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM=fda132cb0c86400381c0af1fe98bd0f775cb566cb247cdcc105e344e00acc30e
9797
# Because of https://github.com/Tencent/rapidjson/pull/1323, we require
9898
# a pre-release version of RapidJSON to build with GCC 8 without
9999
# warnings.
@@ -160,7 +160,7 @@ DEPENDENCIES=(
160160
"ARROW_OPENTELEMETRY_URL opentelemetry-cpp-${ARROW_OPENTELEMETRY_BUILD_VERSION}.tar.gz https://github.com/open-telemetry/opentelemetry-cpp/archive/refs/tags/${ARROW_OPENTELEMETRY_BUILD_VERSION}.tar.gz"
161161
"ARROW_OPENTELEMETRY_PROTO_URL opentelemetry-proto-${ARROW_OPENTELEMETRY_PROTO_BUILD_VERSION}.tar.gz https://github.com/open-telemetry/opentelemetry-proto/archive/refs/tags/${ARROW_OPENTELEMETRY_PROTO_BUILD_VERSION}.tar.gz"
162162
"ARROW_ORC_URL orc-${ARROW_ORC_BUILD_VERSION}.tar.gz https://www.apache.org/dyn/closer.lua/orc/orc-${ARROW_ORC_BUILD_VERSION}/orc-${ARROW_ORC_BUILD_VERSION}.tar.gz?action=download"
163-
"ARROW_PROTOBUF_URL protobuf-${ARROW_PROTOBUF_BUILD_VERSION}.tar.gz https://github.com/google/protobuf/releases/download/${ARROW_PROTOBUF_BUILD_VERSION}/protobuf-all-${ARROW_PROTOBUF_BUILD_VERSION:1}.tar.gz"
163+
"ARROW_PROTOBUF_URL protobuf-${ARROW_PROTOBUF_BUILD_VERSION}.tar.gz https://github.com/google/protobuf/releases/download/${ARROW_PROTOBUF_BUILD_VERSION}/protobuf-${ARROW_PROTOBUF_BUILD_VERSION:1}.tar.gz"
164164
"ARROW_RAPIDJSON_URL rapidjson-${ARROW_RAPIDJSON_BUILD_VERSION}.tar.gz https://github.com/miloyip/rapidjson/archive/${ARROW_RAPIDJSON_BUILD_VERSION}.tar.gz"
165165
"ARROW_RE2_URL re2-${ARROW_RE2_BUILD_VERSION}.tar.gz https://github.com/google/re2/archive/${ARROW_RE2_BUILD_VERSION}.tar.gz"
166166
"ARROW_S2N_TLS_URL s2n-${ARROW_S2N_TLS_BUILD_VERSION}.tar.gz https://github.com/aws/s2n-tls/archive/${ARROW_S2N_TLS_BUILD_VERSION}.tar.gz"

0 commit comments

Comments
 (0)