Skip to content

Commit da8887c

Browse files
raulcdraulcd
committed
Try upgrading Abseil, gRPC, Protobuf
1 parent 296882c commit da8887c

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

@@ -3059,53 +3058,71 @@ function(build_absl)
30593058
# Create a target that depends on ALL Abseil libraries that will be installed.
30603059
# This ensures they're all built before we try to install.
30613060
add_custom_target(absl_built
3062-
DEPENDS absl::bad_any_cast_impl
3063-
absl::bad_optional_access
3064-
absl::bad_variant_access
3065-
absl::base
3061+
DEPENDS absl::base
30663062
absl::city
30673063
absl::civil_time
3068-
absl::cord
30693064
absl::cord_internal
3065+
absl::cord
30703066
absl::cordz_functions
30713067
absl::cordz_handle
30723068
absl::cordz_info
30733069
absl::cordz_sample_token
3070+
absl::crc_cord_state
3071+
absl::crc_cpu_detect
3072+
absl::crc_internal
3073+
absl::crc32c
30743074
absl::debugging_internal
3075+
absl::decode_rust_punycode
30753076
absl::demangle_internal
3077+
absl::demangle_rust
3078+
absl::die_if_null
30763079
absl::examine_stack
30773080
absl::exponential_biased
30783081
absl::failure_signal_handler
3079-
absl::flags
3080-
absl::flags_commandlineflag
30813082
absl::flags_commandlineflag_internal
3083+
absl::flags_commandlineflag
30823084
absl::flags_config
30833085
absl::flags_internal
30843086
absl::flags_marshalling
30853087
absl::flags_parse
30863088
absl::flags_private_handle_accessor
30873089
absl::flags_program_name
30883090
absl::flags_reflection
3089-
absl::flags_usage
30903091
absl::flags_usage_internal
3092+
absl::flags_usage
30913093
absl::graphcycles_internal
30923094
absl::hash
30933095
absl::hashtablez_sampler
30943096
absl::int128
3097+
absl::kernel_timeout_internal
30953098
absl::leak_check
3096-
absl::leak_check_disable
3099+
absl::log_flags
3100+
absl::log_globals
3101+
absl::log_initialize
3102+
absl::log_internal_check_op
3103+
absl::log_internal_conditions
3104+
absl::log_internal_fnmatch
3105+
absl::log_internal_format
3106+
absl::log_internal_globals
3107+
absl::log_internal_log_sink_set
3108+
absl::log_internal_message
3109+
absl::log_internal_nullguard
3110+
absl::log_internal_proto
3111+
absl::log_internal_structured_proto
30973112
absl::log_severity
3113+
absl::log_sink
30983114
absl::low_level_hash
30993115
absl::malloc_internal
31003116
absl::periodic_sampler
3117+
absl::poison
31013118
absl::random_distributions
31023119
absl::random_internal_distribution_test_util
3120+
absl::random_internal_entropy_pool
31033121
absl::random_internal_platform
3104-
absl::random_internal_pool_urbg
3105-
absl::random_internal_randen
3106-
absl::random_internal_randen_hwaes
31073122
absl::random_internal_randen_hwaes_impl
3123+
absl::random_internal_randen_hwaes
31083124
absl::random_internal_randen_slow
3125+
absl::random_internal_randen
31093126
absl::random_internal_seed_material
31103127
absl::random_seed_gen_exception
31113128
absl::random_seed_sequences
@@ -3118,13 +3135,17 @@ function(build_absl)
31183135
absl::statusor
31193136
absl::str_format_internal
31203137
absl::strerror
3121-
absl::strings
3138+
absl::string_view
31223139
absl::strings_internal
3140+
absl::strings
31233141
absl::symbolize
31243142
absl::synchronization
31253143
absl::throw_delegate
3144+
absl::time_zone
31263145
absl::time
3127-
absl::time_zone)
3146+
absl::tracing_internal
3147+
absl::utf8_for_code_point
3148+
absl::vlog_config_internal)
31283149

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

32263247
set(gRPC_SSL_PROVIDER "none")
32273248
set(_gRPC_SSL_LIBRARIES "OpenSSL::SSL;OpenSSL::Crypto")
3228-
set(gRPC_ZLIB_PROVIDER "package")
3249+
set(gRPC_ZLIB_PROVIDER "none")
3250+
set(_gRPC_ZLIB_LIBRARIES "ZLIB::ZLIB")
32293251
set(gRPC_INSTALL OFF)
32303252
set(gRPC_BUILD_TESTS OFF)
32313253

@@ -3250,8 +3272,7 @@ function(build_grpc)
32503272
gpr
32513273
grpc
32523274
grpc++
3253-
grpc++_reflection
3254-
upb)
3275+
grpc++_reflection)
32553276

32563277
foreach(target ${GRPC_LIBRARY_TARGETS})
32573278
if(TARGET ${target} AND NOT TARGET gRPC::${target})
@@ -3299,8 +3320,7 @@ function(build_grpc)
32993320
gRPC::address_sorting
33003321
gRPC::gpr
33013322
gRPC::grpc
3302-
gRPC::grpcpp_for_bundling
3303-
gRPC::upb)
3323+
gRPC::grpcpp_for_bundling)
33043324
set(ARROW_BUNDLED_STATIC_LIBS
33053325
"${ARROW_BUNDLED_STATIC_LIBS}"
33063326
PARENT_SCOPE)
@@ -3635,8 +3655,6 @@ macro(build_google_cloud_cpp_storage)
36353655
# (and then some regexing)
36363656
list(APPEND
36373657
ARROW_BUNDLED_STATIC_LIBS
3638-
absl::bad_optional_access
3639-
absl::bad_variant_access
36403658
absl::base
36413659
absl::civil_time
36423660
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)