Skip to content

Commit 686971e

Browse files
authored
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]>
1 parent 6452194 commit 686971e

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

cpp/cmake_modules/ThirdpartyToolchain.cmake

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -958,6 +958,9 @@ set(EP_COMMON_CMAKE_ARGS
958958
-DCMAKE_INSTALL_LIBDIR=lib
959959
-DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
960960
-DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE}
961+
# We set CMAKE_POLICY_VERSION_MINIMUM temporarily due to failures with CMake 4
962+
# We should remove it once we have updated the dependencies:
963+
# https://github.com/apache/arrow/issues/45985
961964
-DCMAKE_POLICY_VERSION_MINIMUM=3.5)
962965

963966
# if building with a toolchain file, pass that through
@@ -1026,6 +1029,9 @@ macro(prepare_fetchcontent)
10261029
set(CMAKE_COMPILE_WARNING_AS_ERROR FALSE)
10271030
set(CMAKE_EXPORT_NO_PACKAGE_REGISTRY TRUE)
10281031
set(CMAKE_MACOSX_RPATH ${ARROW_INSTALL_NAME_RPATH})
1032+
# We set CMAKE_POLICY_VERSION_MINIMUM temporarily due to failures with CMake 4
1033+
# We should remove it once we have updated the dependencies:
1034+
# https://github.com/apache/arrow/issues/45985
10291035
set(CMAKE_POLICY_VERSION_MINIMUM 3.5)
10301036

10311037
if(MSVC)
@@ -1387,6 +1393,9 @@ macro(build_snappy)
13871393
set(SNAPPY_CMAKE_ARGS
13881394
${EP_COMMON_CMAKE_ARGS} -DSNAPPY_BUILD_TESTS=OFF -DSNAPPY_BUILD_BENCHMARKS=OFF
13891395
"-DCMAKE_INSTALL_PREFIX=${SNAPPY_PREFIX}")
1396+
# We can remove this once we remove -DCMAKE_POLICY_VERSION_MINIMUM=3.5
1397+
# from EP_COMMON_CMAKE_ARGS.
1398+
list(REMOVE_ITEM SNAPPY_CMAKE_ARGS -DCMAKE_POLICY_VERSION_MINIMUM=3.5)
13901399
# Snappy unconditionally enables -Werror when building with clang this can lead
13911400
# to build failures by way of new compiler warnings. This adds a flag to disable
13921401
# -Werror to the very end of the invocation to override the snappy internal setting.

cpp/thirdparty/versions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ ARROW_RAPIDJSON_BUILD_VERSION=232389d4f1012dddec4ef84861face2d2ba85709
101101
ARROW_RAPIDJSON_BUILD_SHA256_CHECKSUM=b9290a9a6d444c8e049bd589ab804e0ccf2b05dc5984a19ed5ae75d090064806
102102
ARROW_RE2_BUILD_VERSION=2022-06-01
103103
ARROW_RE2_BUILD_SHA256_CHECKSUM=f89c61410a072e5cbcf8c27e3a778da7d6fd2f2b5b1445cd4f4508bee946ab0f
104-
ARROW_SNAPPY_BUILD_VERSION=1.1.10
105-
ARROW_SNAPPY_BUILD_SHA256_CHECKSUM=49d831bffcc5f3d01482340fe5af59852ca2fe76c3e05df0e67203ebbe0f1d90
104+
ARROW_SNAPPY_BUILD_VERSION=1.2.2
105+
ARROW_SNAPPY_BUILD_SHA256_CHECKSUM=90f74bc1fbf78a6c56b3c4a082a05103b3a56bb17bca1a27e052ea11723292dc
106106
ARROW_SUBSTRAIT_BUILD_VERSION=v0.44.0
107107
ARROW_SUBSTRAIT_BUILD_SHA256_CHECKSUM=f989a862f694e7dbb695925ddb7c4ce06aa6c51aca945105c075139aed7e55a2
108108
ARROW_S2N_TLS_BUILD_VERSION=v1.3.35

0 commit comments

Comments
 (0)