Apply change for arrow cmake file

apache · Jul 2, 2024 · 72021cb · 72021cb
1 parent e1d3136
commit 72021cb
Showing 1 changed file with 18 additions and 5 deletions.
diff --git a/ep/build-velox/src/modify_velox.patch b/ep/build-velox/src/modify_velox.patch
@@ -36,25 +36,38 @@ index d49115f12..1aaa8e532 100644
 +  endif()
  endif()
 diff --git a/CMake/resolve_dependency_modules/arrow/CMakeLists.txt b/CMake/resolve_dependency_modules/arrow/CMakeLists.txt
-index 3f01df2fd..8c1c493f3 100644
+index 3f01df2fd..a8da374a2 100644
 --- a/CMake/resolve_dependency_modules/arrow/CMakeLists.txt
 +++ b/CMake/resolve_dependency_modules/arrow/CMakeLists.txt
-@@ -24,6 +24,9 @@ if(VELOX_ENABLE_ARROW)
+@@ -23,7 +23,11 @@ if(VELOX_ENABLE_ARROW)
+
    set(ARROW_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/arrow_ep")
    set(ARROW_CMAKE_ARGS
-       -DARROW_PARQUET=OFF
+-      -DARROW_PARQUET=OFF
 +      -DARROW_PARQUET=ON
 +      -DARROW_FILESYSTEM=ON
 +      -DARROW_PROTOBUF_USE_SHARED=OFF
++      -DARROW_DEPENDENCY_USE_SHARED=OFF
++      -DARROW_DEPENDENCY_SOURCE=BUNDLED
        -DARROW_WITH_THRIFT=ON
        -DARROW_WITH_LZ4=ON
        -DARROW_WITH_SNAPPY=ON
-@@ -66,6 +69,8 @@ if(VELOX_ENABLE_ARROW)
+@@ -37,7 +41,7 @@ if(VELOX_ENABLE_ARROW)
+       -DCMAKE_INSTALL_PREFIX=${ARROW_PREFIX}/install
+       -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+       -DARROW_BUILD_STATIC=ON
+-      -DThrift_SOURCE=${THRIFT_SOURCE})
++      -DARROW_BUILD_SHARED=OFF)
+   set(ARROW_LIBDIR ${ARROW_PREFIX}/install/${CMAKE_INSTALL_LIBDIR})
+
+   add_library(thrift STATIC IMPORTED GLOBAL)
+@@ -66,6 +70,9 @@ if(VELOX_ENABLE_ARROW)
      arrow_ep
      PREFIX ${ARROW_PREFIX}
      URL ${VELOX_ARROW_SOURCE_URL}
 +    PATCH_COMMAND patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/modify_arrow.patch
-+    COMMAND patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/modify_arrow_dataset_scan_option.patch
++    COMMAND patch -p1 <
++            ${CMAKE_CURRENT_SOURCE_DIR}/modify_arrow_dataset_scan_option.patch
      URL_HASH ${VELOX_ARROW_BUILD_SHA256_CHECKSUM}
      SOURCE_SUBDIR cpp
      CMAKE_ARGS ${ARROW_CMAKE_ARGS}