Skip to content

Commit bbed18d

Browse files
committed
Try with protobuf 31.1 instead
1 parent eda8076 commit bbed18d

File tree

2 files changed

+18
-12
lines changed

2 files changed

+18
-12
lines changed

cpp/cmake_modules/ThirdpartyToolchain.cmake

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3059,19 +3059,22 @@ function(build_absl)
30593059
# Create a target that depends on ALL Abseil libraries that will be installed.
30603060
# This ensures they're all built before we try to install.
30613061
add_custom_target(absl_built
3062-
DEPENDS absl::base
3062+
DEPENDS absl::bad_any_cast_impl
3063+
absl::bad_optional_access
3064+
absl::bad_variant_access
3065+
absl::base
30633066
absl::city
30643067
absl::civil_time
3065-
absl::cord_internal
30663068
absl::cord
3069+
absl::cord_internal
30673070
absl::cordz_functions
30683071
absl::cordz_handle
30693072
absl::cordz_info
30703073
absl::cordz_sample_token
3074+
absl::crc32c
30713075
absl::crc_cord_state
30723076
absl::crc_cpu_detect
30733077
absl::crc_internal
3074-
absl::crc32c
30753078
absl::debugging_internal
30763079
absl::decode_rust_punycode
30773080
absl::demangle_internal
@@ -3080,23 +3083,24 @@ function(build_absl)
30803083
absl::examine_stack
30813084
absl::exponential_biased
30823085
absl::failure_signal_handler
3083-
absl::flags_commandlineflag_internal
30843086
absl::flags_commandlineflag
3087+
absl::flags_commandlineflag_internal
30853088
absl::flags_config
30863089
absl::flags_internal
30873090
absl::flags_marshalling
30883091
absl::flags_parse
30893092
absl::flags_private_handle_accessor
30903093
absl::flags_program_name
30913094
absl::flags_reflection
3092-
absl::flags_usage_internal
30933095
absl::flags_usage
3096+
absl::flags_usage_internal
30943097
absl::graphcycles_internal
30953098
absl::hash
30963099
absl::hashtablez_sampler
30973100
absl::int128
30983101
absl::kernel_timeout_internal
30993102
absl::leak_check
3103+
absl::log_entry
31003104
absl::log_flags
31013105
absl::log_globals
31023106
absl::log_initialize
@@ -3118,12 +3122,12 @@ function(build_absl)
31183122
absl::poison
31193123
absl::random_distributions
31203124
absl::random_internal_distribution_test_util
3121-
absl::random_internal_entropy_pool
31223125
absl::random_internal_platform
3123-
absl::random_internal_randen_hwaes_impl
3126+
absl::random_internal_pool_urbg
3127+
absl::random_internal_randen
31243128
absl::random_internal_randen_hwaes
3129+
absl::random_internal_randen_hwaes_impl
31253130
absl::random_internal_randen_slow
3126-
absl::random_internal_randen
31273131
absl::random_internal_seed_material
31283132
absl::random_seed_gen_exception
31293133
absl::random_seed_sequences
@@ -3137,13 +3141,13 @@ function(build_absl)
31373141
absl::str_format_internal
31383142
absl::strerror
31393143
absl::string_view
3140-
absl::strings_internal
31413144
absl::strings
3145+
absl::strings_internal
31423146
absl::symbolize
31433147
absl::synchronization
31443148
absl::throw_delegate
3145-
absl::time_zone
31463149
absl::time
3150+
absl::time_zone
31473151
absl::tracing_internal
31483152
absl::utf8_for_code_point
31493153
absl::vlog_config_internal)
@@ -3656,6 +3660,8 @@ macro(build_google_cloud_cpp_storage)
36563660
# (and then some regexing)
36573661
list(APPEND
36583662
ARROW_BUNDLED_STATIC_LIBS
3663+
absl::bad_optional_access
3664+
absl::bad_variant_access
36593665
absl::base
36603666
absl::civil_time
36613667
absl::cord

cpp/thirdparty/versions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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=v33.1
96-
ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM=fda132cb0c86400381c0af1fe98bd0f775cb566cb247cdcc105e344e00acc30e
95+
ARROW_PROTOBUF_BUILD_VERSION=v31.1
96+
ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM=12bfd76d27b9ac3d65c00966901609e020481b9474ef75c7ff4601ac06fa0b82
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.

0 commit comments

Comments
 (0)