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

yuanzhou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git


The following commit(s) were added to refs/heads/main by this push:
     new 3b98972567 [GLUTEN-10369][VL] Fix arrow cmake check (#10370)
3b98972567 is described below

commit 3b98972567ab1cae8d8453cfee13625287db5400
Author: Yuan <[email protected]>
AuthorDate: Wed Aug 6 22:46:06 2025 +0100

    [GLUTEN-10369][VL] Fix arrow cmake check (#10370)
    
    Velox upgraded to use Cmake 4.0, thus we need a patch to build arrow 
otherwise it will report cmake compatibility issue
    
    Fixes: #10369
    
    Signed-off-by: Yuan <[email protected]>
---
 dev/build_arrow.sh                           |  1 +
 ep/build-velox/src/cmake-compatibility.patch | 34 ++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/dev/build_arrow.sh b/dev/build_arrow.sh
index b68bcd4af7..30a68bc736 100755
--- a/dev/build_arrow.sh
+++ b/dev/build_arrow.sh
@@ -31,6 +31,7 @@ function prepare_arrow_build() {
   cd arrow_ep
   patch -p1 < $CURRENT_DIR/../ep/build-velox/src/modify_arrow.patch
   patch -p1 < 
$CURRENT_DIR/../ep/build-velox/src/modify_arrow_dataset_scan_option.patch
+  patch -p1 < $CURRENT_DIR/../ep/build-velox/src/cmake-compatibility.patch
   popd
 }
 
diff --git a/ep/build-velox/src/cmake-compatibility.patch 
b/ep/build-velox/src/cmake-compatibility.patch
new file mode 100644
index 0000000000..249ea60904
--- /dev/null
+++ b/ep/build-velox/src/cmake-compatibility.patch
@@ -0,0 +1,34 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# Licensed 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.
+
+--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
++++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
+@@ -971,7 +971,8 @@
+     
-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=${CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY}
+     -DCMAKE_INSTALL_LIBDIR=lib
+     -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
+-    -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE})
++    -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE}
++    -DCMAKE_POLICY_VERSION_MINIMUM=3.5)
+
+ # Enable s/ccache if set by parent.
+ if(CMAKE_C_COMPILER_LAUNCHER AND CMAKE_CXX_COMPILER_LAUNCHER)
+@@ -1026,6 +1027,7 @@
+   set(CMAKE_COMPILE_WARNING_AS_ERROR FALSE)
+   set(CMAKE_EXPORT_NO_PACKAGE_REGISTRY TRUE)
+   set(CMAKE_MACOSX_RPATH ${ARROW_INSTALL_NAME_RPATH})
++  set(CMAKE_POLICY_VERSION_MINIMUM 3.5)
+   if(MSVC)
+     string(REPLACE "/WX" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
+     string(REPLACE "/WX" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to