You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ko...@apache.org on 2025/08/26 08:29:53 UTC

(arrow) branch main updated: GH-47401: [C++] Remove needless Snappy patch (#47407)

This is an automated email from the ASF dual-hosted git repository.

kou 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 1672472be8 GH-47401: [C++] Remove needless Snappy patch (#47407)
1672472be8 is described below

commit 1672472be81ff44a27af2259bb3d8fc40e5309fd
Author: Sutou Kouhei <ko...@clear-code.com>
AuthorDate: Tue Aug 26 17:29:47 2025 +0900

    GH-47401: [C++] Remove needless Snappy patch (#47407)
    
    ### Rationale for this change
    
    Snappy 1.2.2 ships this.
    
    ### What changes are included in this PR?
    
    Remove needless the Snappy patch.
    
    ### Are these changes tested?
    
    Yes.
    
    ### Are there any user-facing changes?
    
    No.
    * GitHub Issue: #47401
    
    Authored-by: Sutou Kouhei <ko...@clear-code.com>
    Signed-off-by: Sutou Kouhei <ko...@clear-code.com>
---
 cpp/cmake_modules/ThirdpartyToolchain.cmake | 10 ----------
 cpp/cmake_modules/snappy.diff               | 31 -----------------------------
 2 files changed, 41 deletions(-)

diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 3baf73a358..6e7544a707 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -1411,15 +1411,6 @@ macro(build_snappy)
     )
   endforeach()
 
-  if(APPLE AND CMAKE_HOST_SYSTEM_VERSION VERSION_LESS 20)
-    # On macOS 10.13 we need to explicitly add <functional> to avoid a missing include error
-    # This can be removed once CRAN no longer checks on macOS 10.13
-    find_program(PATCH patch REQUIRED)
-    set(SNAPPY_PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_CURRENT_LIST_DIR}/snappy.diff)
-  else()
-    set(SNAPPY_PATCH_COMMAND)
-  endif()
-
   if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
     # ignore linker flag errors, as Snappy sets
     # -Werror -Wall, and Emscripten doesn't support -soname
@@ -1434,7 +1425,6 @@ macro(build_snappy)
                       INSTALL_DIR ${SNAPPY_PREFIX}
                       URL ${SNAPPY_SOURCE_URL}
                       URL_HASH "SHA256=${ARROW_SNAPPY_BUILD_SHA256_CHECKSUM}"
-                      PATCH_COMMAND ${SNAPPY_PATCH_COMMAND}
                       CMAKE_ARGS ${SNAPPY_CMAKE_ARGS}
                       BUILD_BYPRODUCTS "${SNAPPY_STATIC_LIB}")
 
diff --git a/cpp/cmake_modules/snappy.diff b/cpp/cmake_modules/snappy.diff
deleted file mode 100644
index e763636e1d..0000000000
--- a/cpp/cmake_modules/snappy.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# https://github.com/google/snappy/pull/172
-
-diff --git a/snappy.cc b/snappy.cc
-index d414718..5b0d0d6 100644
---- a/snappy.cc
-+++ b/snappy.cc
-@@ -83,6 +83,7 @@
- #include <string>
- #include <utility>
- #include <vector>
-+#include <functional>
- 
- namespace snappy {
-