You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by li...@apache.org on 2022/07/14 19:59:07 UTC
[arrow] branch master updated: ARROW-16734: [C++] Bump vendored version of protobuf (#13581)
This is an automated email from the ASF dual-hosted git repository.
lidavidm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 5d86e9fc40 ARROW-16734: [C++] Bump vendored version of protobuf (#13581)
5d86e9fc40 is described below
commit 5d86e9fc4063ab56e6fb4fb0b44667d3c1b74836
Author: Raúl Cumplido <ra...@gmail.com>
AuthorDate: Thu Jul 14 21:58:58 2022 +0200
ARROW-16734: [C++] Bump vendored version of protobuf (#13581)
Authored-by: Raúl Cumplido <ra...@gmail.com>
Signed-off-by: David Li <li...@gmail.com>
---
cpp/cmake_modules/ThirdpartyToolchain.cmake | 12 ++++++++----
cpp/thirdparty/versions.txt | 4 ++--
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index b4eee77616..5d1da18b77 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -1730,15 +1730,19 @@ macro(build_substrait)
set(SUBSTRAIT_CPP_DIR "${CMAKE_CURRENT_BINARY_DIR}/substrait_ep-generated")
file(MAKE_DIRECTORY ${SUBSTRAIT_CPP_DIR})
- set(SUBSTRAIT_SUPPRESSED_WARNINGS)
+ set(SUBSTRAIT_SUPPRESSED_FLAGS)
if(MSVC)
# Protobuf generated files trigger some spurious warnings on MSVC.
# Implicit conversion from uint64_t to uint32_t:
- list(APPEND SUBSTRAIT_SUPPRESSED_WARNINGS "/wd4244")
+ list(APPEND SUBSTRAIT_SUPPRESSED_FLAGS "/wd4244")
# Missing dll-interface:
- list(APPEND SUBSTRAIT_SUPPRESSED_WARNINGS "/wd4251")
+ list(APPEND SUBSTRAIT_SUPPRESSED_FLAGS "/wd4251")
+ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL
+ "Clang")
+ # Protobuf generated files trigger some errors on CLANG TSAN builds
+ list(APPEND SUBSTRAIT_SUPPRESSED_FLAGS "-Wno-error=shorten-64-to-32")
endif()
set(SUBSTRAIT_SOURCES)
@@ -1749,7 +1753,7 @@ macro(build_substrait)
foreach(EXT h cc)
set_source_files_properties("${SUBSTRAIT_PROTO_GEN}.${EXT}"
PROPERTIES COMPILE_OPTIONS
- "${SUBSTRAIT_SUPPRESSED_WARNINGS}"
+ "${SUBSTRAIT_SUPPRESSED_FLAGS}"
GENERATED TRUE
SKIP_UNITY_BUILD_INCLUSION TRUE)
list(APPEND SUBSTRAIT_PROTO_GEN_ALL "${SUBSTRAIT_PROTO_GEN}.${EXT}")
diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt
index 6dc2d0bb96..789402a1a0 100644
--- a/cpp/thirdparty/versions.txt
+++ b/cpp/thirdparty/versions.txt
@@ -70,8 +70,8 @@ ARROW_OPENTELEMETRY_PROTO_BUILD_VERSION=v0.17.0
ARROW_OPENTELEMETRY_PROTO_BUILD_SHA256_CHECKSUM=f269fbcb30e17b03caa1decd231ce826e59d7651c0f71c3b28eb5140b4bb5412
ARROW_ORC_BUILD_VERSION=1.7.5
ARROW_ORC_BUILD_SHA256_CHECKSUM=b90cae5853e3ea0e5bf64e3883d09d871ec280536e0bb2cc52d08f79f0be0010
-ARROW_PROTOBUF_BUILD_VERSION=v3.18.1
-ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM=b8ab9bbdf0c6968cf20060794bc61e231fae82aaf69d6e3577c154181991f576
+ARROW_PROTOBUF_BUILD_VERSION=v21.2
+ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM=9ae699200f3a80c735f9dc3b20e46d447584266f4601403e8fe5b97005f204dd
# Because of https://github.com/Tencent/rapidjson/pull/1323, we require
# a pre-release version of RapidJSON to build with GCC 8 without
# warnings.