Set build arg for install script

apache · Jun 28, 2024 · 9d6654b · 9d6654b
1 parent e459655
commit 9d6654b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/cpp/CMake/ConfigArrow.cmake b/cpp/CMake/ConfigArrow.cmake
@@ -21,6 +21,11 @@ set(ARROW_LIB_NAME "arrow")
 set(PARQUET_LIB_NAME "parquet")
 set(ARROW_BUNDLED_DEPS "arrow_bundled_dependencies")
 
+set(ARROW_INSTALL_DIR "${ARROW_HOME}/install")
+set(ARROW_LIB_DIR "${ARROW_INSTALL_DIR}/lib")
+set(ARROW_LIB64_DIR "${ARROW_INSTALL_DIR}/lib64")
+set(ARROW_INCLUDE_DIR "${ARROW_INSTALL_DIR}/include")
+
 function(FIND_ARROW_LIB LIB_NAME)
   if(NOT TARGET Arrow::${LIB_NAME})
     set(ARROW_LIB_FULL_NAME
@@ -48,8 +53,3 @@ function(FIND_ARROW_LIB LIB_NAME)
     endif()
   endif()
 endfunction()
-
-set(ARROW_INSTALL_DIR "${ARROW_HOME}/install")
-set(ARROW_LIB_DIR "${ARROW_INSTALL_DIR}/lib")
-set(ARROW_LIB64_DIR "${ARROW_INSTALL_DIR}/lib64")
-set(ARROW_INCLUDE_DIR "${ARROW_INSTALL_DIR}/include")
diff --git a/dev/build_arrow.sh b/dev/build_arrow.sh
@@ -18,8 +18,6 @@ CURRENT_DIR=$(cd "$(dirname "$BASH_SOURCE")"; pwd)
 source ${CURRENT_DIR}/build_helper_functions.sh
 VELOX_ARROW_BUILD_VERSION=15.0.0
 ARROW_PREFIX=$CURRENT_DIR/arrow_ep
-# Always uses BUNDLED in case of that thrift is not installed.
-THRIFT_SOURCE="BUNDLED"
 BUILD_TYPE=Release
 
 function prepare_arrow_build() {
@@ -38,15 +36,14 @@ function install_arrow_deps {
 }
 
 function build_arrow_cpp() {
- if [ -n "$1" ]; then
-   BUILD_TYPE=$1
- fi
  pushd $ARROW_PREFIX/cpp
 
  cmake_install \
        -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 \
@@ -59,8 +56,8 @@ function build_arrow_cpp() {
        -DARROW_TESTING=ON \
        -DCMAKE_INSTALL_PREFIX=/usr/local \
        -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-       -DARROW_BUILD_STATIC=ON \
-       -DThrift_SOURCE=${THRIFT_SOURCE}
+       -DARROW_BUILD_SHARED=OFF \
+       -DARROW_BUILD_STATIC=ON
  popd
 }
 

diff --git a/dev/builddeps-veloxbe.sh b/dev/builddeps-veloxbe.sh
@@ -192,7 +192,7 @@ function build_arrow {
   cd $GLUTEN_DIR/dev
   source build_arrow.sh
   prepare_arrow_build
-  build_arrow_cpp $BUILD_TYPE
+  build_arrow_cpp
   echo "Finished building arrow CPP"
   build_arrow_java
   echo "Finished building arrow Java"
@@ -208,9 +208,8 @@ function build_velox {
                    --num_threads=$NUM_THREADS
 }
 
-## compile gluten cpp
 function build_gluten_cpp {
-  echo "Start to Gluten CPP"
+  echo "Start to build Gluten CPP"
   cd $GLUTEN_DIR/cpp
   rm -rf build
   mkdir build