Skip to content

Commit 94bc856

Browse files
committed
Try with protobuf 31.1 instead
1 parent da8887c commit 94bc856

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
@@ -3058,19 +3058,22 @@ function(build_absl)
30583058
# Create a target that depends on ALL Abseil libraries that will be installed.
30593059
# This ensures they're all built before we try to install.
30603060
add_custom_target(absl_built
3061-
DEPENDS absl::base
3061+
DEPENDS absl::bad_any_cast_impl
3062+
absl::bad_optional_access
3063+
absl::bad_variant_access
3064+
absl::base
30623065
absl::city
30633066
absl::civil_time
3064-
absl::cord_internal
30653067
absl::cord
3068+
absl::cord_internal
30663069
absl::cordz_functions
30673070
absl::cordz_handle
30683071
absl::cordz_info
30693072
absl::cordz_sample_token
3073+
absl::crc32c
30703074
absl::crc_cord_state
30713075
absl::crc_cpu_detect
30723076
absl::crc_internal
3073-
absl::crc32c
30743077
absl::debugging_internal
30753078
absl::decode_rust_punycode
30763079
absl::demangle_internal
@@ -3079,23 +3082,24 @@ function(build_absl)
30793082
absl::examine_stack
30803083
absl::exponential_biased
30813084
absl::failure_signal_handler
3082-
absl::flags_commandlineflag_internal
30833085
absl::flags_commandlineflag
3086+
absl::flags_commandlineflag_internal
30843087
absl::flags_config
30853088
absl::flags_internal
30863089
absl::flags_marshalling
30873090
absl::flags_parse
30883091
absl::flags_private_handle_accessor
30893092
absl::flags_program_name
30903093
absl::flags_reflection
3091-
absl::flags_usage_internal
30923094
absl::flags_usage
3095+
absl::flags_usage_internal
30933096
absl::graphcycles_internal
30943097
absl::hash
30953098
absl::hashtablez_sampler
30963099
absl::int128
30973100
absl::kernel_timeout_internal
30983101
absl::leak_check
3102+
absl::log_entry
30993103
absl::log_flags
31003104
absl::log_globals
31013105
absl::log_initialize
@@ -3117,12 +3121,12 @@ function(build_absl)
31173121
absl::poison
31183122
absl::random_distributions
31193123
absl::random_internal_distribution_test_util
3120-
absl::random_internal_entropy_pool
31213124
absl::random_internal_platform
3122-
absl::random_internal_randen_hwaes_impl
3125+
absl::random_internal_pool_urbg
3126+
absl::random_internal_randen
31233127
absl::random_internal_randen_hwaes
3128+
absl::random_internal_randen_hwaes_impl
31243129
absl::random_internal_randen_slow
3125-
absl::random_internal_randen
31263130
absl::random_internal_seed_material
31273131
absl::random_seed_gen_exception
31283132
absl::random_seed_sequences
@@ -3136,13 +3140,13 @@ function(build_absl)
31363140
absl::str_format_internal
31373141
absl::strerror
31383142
absl::string_view
3139-
absl::strings_internal
31403143
absl::strings
3144+
absl::strings_internal
31413145
absl::symbolize
31423146
absl::synchronization
31433147
absl::throw_delegate
3144-
absl::time_zone
31453148
absl::time
3149+
absl::time_zone
31463150
absl::tracing_internal
31473151
absl::utf8_for_code_point
31483152
absl::vlog_config_internal)
@@ -3655,6 +3659,8 @@ macro(build_google_cloud_cpp_storage)
36553659
# (and then some regexing)
36563660
list(APPEND
36573661
ARROW_BUNDLED_STATIC_LIBS
3662+
absl::bad_optional_access
3663+
absl::bad_variant_access
36583664
absl::base
36593665
absl::civil_time
36603666
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)