This is an automated email from the ASF dual-hosted git repository.
assignuser pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/main by this push:
new 686971e1b5 GH-45980: [C++] Bump Bundled Snappy version to 1.2.2
(#45981)
686971e1b5 is described below
commit 686971e1b573f22a82f78bfa6feb271d4ffc3d4e
Author: Jacob Wujciak-Jens <[email protected]>
AuthorDate: Wed Apr 2 13:14:53 2025 +0200
GH-45980: [C++] Bump Bundled Snappy version to 1.2.2 (#45981)
### Rationale for this change
CMake 4.0 removed 3.5 as a viable minimum version.
### What changes are included in this PR?
Bump bundled snappy.
### Are these changes tested?
CI
### Are there any user-facing changes?
No.
* GitHub Issue: #45980
Authored-by: Jacob Wujciak-Jens <[email protected]>
Signed-off-by: Jacob Wujciak-Jens <[email protected]>
---
cpp/cmake_modules/ThirdpartyToolchain.cmake | 9 +++++++++
cpp/thirdparty/versions.txt | 4 ++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake
b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index f4de617ced..5d57bf3128 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -958,6 +958,9 @@ set(EP_COMMON_CMAKE_ARGS
-DCMAKE_INSTALL_LIBDIR=lib
-DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
-DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE}
+ # We set CMAKE_POLICY_VERSION_MINIMUM temporarily due to failures with
CMake 4
+ # We should remove it once we have updated the dependencies:
+ # https://github.com/apache/arrow/issues/45985
-DCMAKE_POLICY_VERSION_MINIMUM=3.5)
# if building with a toolchain file, pass that through
@@ -1026,6 +1029,9 @@ macro(prepare_fetchcontent)
set(CMAKE_COMPILE_WARNING_AS_ERROR FALSE)
set(CMAKE_EXPORT_NO_PACKAGE_REGISTRY TRUE)
set(CMAKE_MACOSX_RPATH ${ARROW_INSTALL_NAME_RPATH})
+ # We set CMAKE_POLICY_VERSION_MINIMUM temporarily due to failures with CMake
4
+ # We should remove it once we have updated the dependencies:
+ # https://github.com/apache/arrow/issues/45985
set(CMAKE_POLICY_VERSION_MINIMUM 3.5)
if(MSVC)
@@ -1387,6 +1393,9 @@ macro(build_snappy)
set(SNAPPY_CMAKE_ARGS
${EP_COMMON_CMAKE_ARGS} -DSNAPPY_BUILD_TESTS=OFF
-DSNAPPY_BUILD_BENCHMARKS=OFF
"-DCMAKE_INSTALL_PREFIX=${SNAPPY_PREFIX}")
+ # We can remove this once we remove -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+ # from EP_COMMON_CMAKE_ARGS.
+ list(REMOVE_ITEM SNAPPY_CMAKE_ARGS -DCMAKE_POLICY_VERSION_MINIMUM=3.5)
# Snappy unconditionally enables -Werror when building with clang this can
lead
# to build failures by way of new compiler warnings. This adds a flag to
disable
# -Werror to the very end of the invocation to override the snappy internal
setting.
diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt
index d48da71fd4..2ed7dd637f 100644
--- a/cpp/thirdparty/versions.txt
+++ b/cpp/thirdparty/versions.txt
@@ -101,8 +101,8 @@
ARROW_RAPIDJSON_BUILD_VERSION=232389d4f1012dddec4ef84861face2d2ba85709
ARROW_RAPIDJSON_BUILD_SHA256_CHECKSUM=b9290a9a6d444c8e049bd589ab804e0ccf2b05dc5984a19ed5ae75d090064806
ARROW_RE2_BUILD_VERSION=2022-06-01
ARROW_RE2_BUILD_SHA256_CHECKSUM=f89c61410a072e5cbcf8c27e3a778da7d6fd2f2b5b1445cd4f4508bee946ab0f
-ARROW_SNAPPY_BUILD_VERSION=1.1.10
-ARROW_SNAPPY_BUILD_SHA256_CHECKSUM=49d831bffcc5f3d01482340fe5af59852ca2fe76c3e05df0e67203ebbe0f1d90
+ARROW_SNAPPY_BUILD_VERSION=1.2.2
+ARROW_SNAPPY_BUILD_SHA256_CHECKSUM=90f74bc1fbf78a6c56b3c4a082a05103b3a56bb17bca1a27e052ea11723292dc
ARROW_SUBSTRAIT_BUILD_VERSION=v0.44.0
ARROW_SUBSTRAIT_BUILD_SHA256_CHECKSUM=f989a862f694e7dbb695925ddb7c4ce06aa6c51aca945105c075139aed7e55a2
ARROW_S2N_TLS_BUILD_VERSION=v1.3.35
