Fix more

philo-he · philo-he · commit 776d65b3fc7b · 2026-06-20T16:33:48.000-07:00
diff --git a/.github/workflows/velox_weekly.yml b/.github/workflows/velox_weekly.yml
@@ -35,40 +35,6 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build-on-centos-7:
-    strategy:
-      fail-fast: false
-    if: ${{ startsWith(github.repository, 'apache/') }}
-    runs-on: ubuntu-22.04
-    container: centos:7
-    steps:
-      - name: Build Gluten native libraries and package
-        run: |
-          sed -i -e 's|mirrorlist=|#mirrorlist=|g' /etc/yum.repos.d/CentOS-* || true
-          sed -i -e 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* || true
-          yum update -y
-          yum install -y epel-release sudo dnf
-          yum install -y centos-release-scl
-          rm /etc/yum.repos.d/CentOS-SCLo-scl.repo -f
-          sed -i \
-          -e 's/^mirrorlist/#mirrorlist/' \
-          -e 's/^#baseurl/baseurl/' \
-          -e 's/mirror\.centos\.org/vault.centos.org/' \
-          /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo
-          yum install -y devtoolset-11
-          source /opt/rh/devtoolset-11/enable
-          yum install -y java-1.8.0-openjdk-devel patch wget git perl python3-pip
-          export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk && \
-          export PATH=$JAVA_HOME/bin:$PATH
-
-          # action/checkout does not work centos7 anymore, so we clone the branch instead.
-          git clone -b main --depth=1 https://github.com/apache/gluten.git && cd gluten/
-          if [ ${{ github.event_name }} = "pull_request" ]; then
-            git fetch origin ${{ github.ref }}:pr_branch && git checkout pr_branch
-          fi
-          echo "TEST ONLY"
-          ./dev/package.sh --spark_version=3.5
-
   build-on-centos:
     strategy:
       fail-fast: false
@@ -86,25 +52,19 @@ jobs:
           sed -i -e "s|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g" /etc/yum.repos.d/CentOS-* || true
       - name: build
         run: |
-          yum update -y
-          yum install -y epel-release sudo dnf
-          if [ "${{ matrix.os }}" = "centos:7" ]; then
-            yum install -y centos-release-scl
-            rm /etc/yum.repos.d/CentOS-SCLo-scl.repo -f
-            sed -i \
-            -e 's/^mirrorlist/#mirrorlist/' \
-            -e 's/^#baseurl/baseurl/' \
-            -e 's/mirror\.centos\.org/vault.centos.org/' \
-            /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo
-            yum install -y devtoolset-11
-            source /opt/rh/devtoolset-11/enable
-          elif [ "${{ matrix.os }}" = "quay.io/centos/centos:stream9" ]; then
-            dnf install -y --setopt=install_weak_deps=False gcc-toolset-12
-            source /opt/rh/gcc-toolset-12/enable || exit 1
-          else
-            dnf install -y --setopt=install_weak_deps=False gcc-toolset-11
-            source /opt/rh/gcc-toolset-11/enable || exit 1
+          if [ "${{ matrix.os }}" = "centos:8" ]; then
+            sed -i -e "s|mirrorlist=|#mirrorlist=|g" /etc/yum.repos.d/CentOS-* || true
+            sed -i -e "s|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g" /etc/yum.repos.d/CentOS-* || true
+            dnf install -y centos-release-stream
+            dnf swap -y centos-{linux,stream}-repos || true
+            sed -i -e "s|mirrorlist=|#mirrorlist=|g" /etc/yum.repos.d/CentOS-Stream-* || true
+            sed -i -e "s|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g" /etc/yum.repos.d/CentOS-Stream-* || true
+            dnf clean all
           fi
+          dnf update -y
+          dnf install -y sudo
+          dnf install -y --setopt=install_weak_deps=False gcc-toolset-12
+          source /opt/rh/gcc-toolset-12/enable || exit 1
           yum install -y java-1.8.0-openjdk-devel patch wget git perl
           export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk && \
           export PATH=$JAVA_HOME/bin:$PATH
@@ -145,7 +105,7 @@ jobs:
             apt autoremove -y
             rm -rf /tmp/*
           fi
-          sudo apt-get install -y openjdk-8-jdk python3-pip cmake libboost-all-dev
+          sudo apt-get install -y openjdk-8-jdk python3-pip cmake
           export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
           cd $GITHUB_WORKSPACE/ && ./dev/package.sh --spark_version=3.5
 
diff --git a/cpp/velox/CMakeLists.txt b/cpp/velox/CMakeLists.txt
@@ -413,17 +413,9 @@ if(DEFINED VCPKG_INSTALLED_DIR
     PRIVATE ${VCPKG_INSTALLED_DIR}/${VCPKG_TRIPLET_DIR}/lib/libthriftcpp2.a
             ${VCPKG_INSTALLED_DIR}/${VCPKG_TRIPLET_DIR}/lib/libthriftprotocol.a)
 else()
-  message(STATUS "Using system thrift libraries from /usr/local/lib")
-  find_library(
-    THRIFTCPP2_LIB
-    NAMES thriftcpp2
-    PATHS /usr/local/lib
-    NO_DEFAULT_PATH)
-  find_library(
-    THRIFTPROTOCOL_LIB
-    NAMES thriftprotocol
-    PATHS /usr/local/lib
-    NO_DEFAULT_PATH)
+  message(STATUS "Using system thrift libraries")
+  find_library(THRIFTCPP2_LIB NAMES thriftcpp2)
+  find_library(THRIFTPROTOCOL_LIB NAMES thriftprotocol)
 
   if(THRIFTCPP2_LIB AND THRIFTPROTOCOL_LIB)
     target_link_libraries(velox PRIVATE ${THRIFTCPP2_LIB} ${THRIFTPROTOCOL_LIB})
diff --git a/dev/build-thirdparty.sh b/dev/build-thirdparty.sh
@@ -38,7 +38,9 @@ function process_setup_ubuntu_2204 {
 function process_setup_centos_9 {
   cp /lib64/{libre2.so.9,libdouble-conversion.so.3,libevent-2.1.so.7,libdwarf.so.0,libicudata.so.67,libicui18n.so.67,libicuuc.so.67,libsodium.so.23} $THIRDPARTY_LIB/
   cp /usr/local/lib/{libboost_context.so.1.84.0,libboost_filesystem.so.1.84.0,libboost_program_options.so.1.84.0,libboost_regex.so.1.84.0,libboost_system.so.1.84.0,libboost_thread.so.1.84.0,libboost_atomic.so.1.84.0} $THIRDPARTY_LIB/
-  cp /usr/local/lib/{libgflags.so.2.2,libglog.so.1,libgeos.so.3.10.7} $THIRDPARTY_LIB/
+  cp /usr/local/lib/libgflags.so.2.2 $THIRDPARTY_LIB/
+  find /usr/local/lib /usr/local/lib64 -name "libglog.so.1" -exec cp {} $THIRDPARTY_LIB/ \; 2>/dev/null
+  find /usr/local/lib /usr/local/lib64 -name "libgeos.so.3.10.7" -exec cp {} $THIRDPARTY_LIB/ \; 2>/dev/null
 }
 
 function process_setup_centos_8 {
diff --git a/dev/vcpkg/triplets/arm64-linux-neon.cmake b/dev/vcpkg/triplets/arm64-linux-neon.cmake
@@ -12,3 +12,7 @@ set(VCPKG_LINKER_FLAGS "-static-libstdc++ -static-libgcc")
 if("${PORT}" STREQUAL "openssl" AND "$ENV{VCPKG_DYNAMIC_OPENSSL}" STREQUAL "ON")
     set(VCPKG_LIBRARY_LINKAGE dynamic)
 endif()
+
+if("${PORT}" STREQUAL "icu")
+    set(VCPKG_LIBRARY_LINKAGE dynamic)
+endif()
diff --git a/dev/vcpkg/vcpkg-configuration.json b/dev/vcpkg/vcpkg-configuration.json
@@ -15,6 +15,5 @@
       "baseline": "a7b6122f6b6504d16d96117336a0562693579933",
       "packages": [ "upb"]
     }
-
   ]
 }
diff --git a/ep/build-velox/src/build-velox.sh b/ep/build-velox/src/build-velox.sh
@@ -120,6 +120,7 @@ function compile {
       -DVELOX_MONO_LIBRARY=ON -DVELOX_BUILD_RUNNER=OFF -DVELOX_SIMDJSON_SKIPUTF8VALIDATION=ON \
       -DVELOX_ENABLE_GEO=OFF"
   if [[ "$(uname)" == "Darwin" && "$INSTALL_PREFIX" != "/usr/local" && "$INSTALL_PREFIX" != /usr/local/* ]]; then
+    COMPILE_OPTION="$COMPILE_OPTION -DCMAKE_PREFIX_PATH=$INSTALL_PREFIX"
     COMPILE_OPTION="$COMPILE_OPTION -DCMAKE_NO_SYSTEM_FROM_IMPORTED=ON"
     COMPILE_OPTION="$COMPILE_OPTION -DCMAKE_IGNORE_PREFIX_PATH=/usr/local"
     COMPILE_OPTION="$COMPILE_OPTION -DCMAKE_IGNORE_PATH=/usr/local\;/usr/local/include\;/usr/local/lib\;/usr/local/lib/cmake"
diff --git a/ep/build-velox/src/get-velox.sh b/ep/build-velox/src/get-velox.sh
@@ -147,6 +147,13 @@ function apply_compilation_fixes {
   fi
   $SUDO_CMD cp ${CURRENT_DIR}/modify_arrow.patch ${VELOX_HOME}/CMake/resolve_dependency_modules/arrow/
 
+  # Disable ARROW_TESTING in Velox's Arrow build to avoid Boost::process dependency on Linux.
+  # On macOS, Boost from Homebrew provides Boost::process properly.
+  if [ "$OS" == "Linux" ]; then
+    sed -i'' -e 's/-DARROW_TESTING=ON/-DARROW_TESTING=OFF/g' ${VELOX_HOME}/CMake/resolve_dependency_modules/arrow/CMakeLists.txt
+    sed -i'' -e '/libarrow_testing/d' ${VELOX_HOME}/CMake/resolve_dependency_modules/arrow/CMakeLists.txt
+  fi
+
   git add ${VELOX_HOME}/CMake/resolve_dependency_modules/arrow/modify_arrow.patch # to avoid the file from being deleted by git clean -dffx :/
 }
 
diff --git a/ep/build-velox/src/setup-centos8.sh b/ep/build-velox/src/setup-centos8.sh
@@ -36,14 +36,16 @@ NPROC=$(getconf _NPROCESSORS_ONLN)
 export CFLAGS=$(get_cxx_flags $CPU_TARGET)  # Used by LZO.
 export CXXFLAGS=$CFLAGS  # Used by boost.
 export CPPFLAGS=$CFLAGS  # Used by LZO.
+export INSTALL_PREFIX=${INSTALL_PREFIX:-/usr/local}
+EXTRA_PKG_CXXFLAGS=" -isystem ${INSTALL_PREFIX}/include"
 CMAKE_BUILD_TYPE="${BUILD_TYPE:-Release}"
 BUILD_DUCKDB="${BUILD_DUCKDB:-true}"
 BUILD_GEOS="${BUILD_GEOS:-true}"
-export CC=/opt/rh/gcc-toolset-11/root/bin/gcc
-export CXX=/opt/rh/gcc-toolset-11/root/bin/g++
+export CC=/opt/rh/gcc-toolset-12/root/bin/gcc
+export CXX=/opt/rh/gcc-toolset-12/root/bin/g++
 DEPENDENCY_DIR=${DEPENDENCY_DIR:-$(pwd)/deps-download}
 
-FB_OS_VERSION="v2026.02.23.00"
+FB_OS_VERSION="v2026.01.05.00"
 FMT_VERSION="11.2.0"
 FAST_FLOAT_VERSION="v8.0.2"
 BOOST_VERSION="boost-1.84.0"
@@ -59,7 +61,7 @@ function install_build_prerequisites {
   dnf_install epel-release dnf-plugins-core # For ccache, ninja
   dnf config-manager --set-enabled powertools
   dnf update -y
-  dnf_install ninja-build curl ccache gcc-toolset-11 git wget which expat-devel gettext-devel
+  dnf_install ninja-build curl ccache gcc-toolset-12 git wget which expat-devel gettext-devel
   dnf_install yasm
   dnf_install autoconf automake python39 python39-devel python39-pip libtool
   pip3.9 install cmake==3.28.3
@@ -69,7 +71,8 @@ function install_build_prerequisites {
 function install_velox_deps_from_dnf {
   dnf_install libevent-devel \
     openssl-devel re2-devel libzstd-devel lz4-devel double-conversion-devel \
-    libdwarf-devel curl-devel libicu-devel bison flex libsodium-devel
+    libdwarf-devel curl-devel libicu-devel bison flex libsodium-devel \
+    kernel-headers
 
   # install sphinx for doc gen
   pip3.9 install sphinx sphinx-tabs breathe sphinx_rtd_theme
@@ -167,12 +170,15 @@ function install_folly {
 
 function install_wangle {
   wget_and_untar https://github.com/facebook/wangle/archive/refs/tags/${FB_OS_VERSION}.tar.gz wangle
-  cmake_install_dir wangle/wangle -DBUILD_TESTS=OFF
+  cmake_install_dir wangle/wangle -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF
 }
 
 function install_fbthrift {
   wget_and_untar https://github.com/facebook/fbthrift/archive/refs/tags/${FB_OS_VERSION}.tar.gz fbthrift
-  cmake_install_dir fbthrift -Denable_tests=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF
+  cd ${DEPENDENCY_DIR}/fbthrift
+  git apply ${VELOX_HOME:-${DEPENDENCY_DIR}/../}/CMake/resolve_dependency_modules/fbthrift/compactv1-protocol-refiller.patch 2>/dev/null || true
+  cd ${DEPENDENCY_DIR}
+  cmake_install_dir fbthrift -Denable_tests=OFF -DBUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF
 }
 
 function install_mvfst {
@@ -228,7 +234,7 @@ function install_velox_deps {
 (
   if [[ $# -ne 0 ]]; then
     # Activate gcc11; enable errors on unset variables afterwards.
-    source /opt/rh/gcc-toolset-11/enable || exit 1
+    source /opt/rh/gcc-toolset-12/enable || exit 1
     set -u
     for cmd in "$@"; do
       run_and_time "${cmd}"
@@ -242,7 +248,7 @@ function install_velox_deps {
       echo "Skipping installation of build dependencies since INSTALL_PREREQUISITES is not set"
     fi
     # Activate gcc11; enable errors on unset variables afterwards.
-    source /opt/rh/gcc-toolset-11/enable || exit 1
+    source /opt/rh/gcc-toolset-12/enable || exit 1
     set -u
     install_velox_deps
     echo "All dependencies for Velox installed!"
diff --git a/ep/build-velox/src/setup-openeuler24.sh b/ep/build-velox/src/setup-openeuler24.sh
@@ -36,6 +36,7 @@ NPROC=$(getconf _NPROCESSORS_ONLN)
 export CFLAGS=$(get_cxx_flags $CPU_TARGET)  # Used by LZO.
 export CXXFLAGS=$CFLAGS  # Used by boost.
 export CPPFLAGS=$CFLAGS  # Used by LZO.
+EXTRA_PKG_CXXFLAGS=" -isystem ${INSTALL_PREFIX}/include"
 CMAKE_BUILD_TYPE="${BUILD_TYPE:-Release}"
 VELOX_BUILD_SHARED=${VELOX_BUILD_SHARED:-"OFF"} #Build folly and gflags shared for use in libvelox.so.
 BUILD_DUCKDB="${BUILD_DUCKDB:-true}"
@@ -44,8 +45,8 @@ VERSION=$(cat /etc/os-release | grep VERSION_ID)
 export INSTALL_PREFIX=${INSTALL_PREFIX:-"/usr/local"}
 DEPENDENCY_DIR=${DEPENDENCY_DIR:-$(pwd)/deps-download}
 
-FB_OS_VERSION="v2026.02.23.00"
-FMT_VERSION="10.1.1"
+FB_OS_VERSION="v2026.01.05.00"
+FMT_VERSION="11.2.0"
 BOOST_VERSION="boost-1.84.0"
 DUCKDB_VERSION="v0.8.1"
 GEOS_VERSION="3.10.7"
@@ -155,11 +156,14 @@ function install_folly {
 
 function install_wangle {
   wget_and_untar https://github.com/facebook/wangle/archive/refs/tags/${FB_OS_VERSION}.tar.gz wangle
-  cmake_install_dir wangle/wangle -DBUILD_TESTS=OFF
+  cmake_install_dir wangle/wangle -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF
 }
 
 function install_fbthrift {
   wget_and_untar https://github.com/facebook/fbthrift/archive/refs/tags/${FB_OS_VERSION}.tar.gz fbthrift
+  cd ${DEPENDENCY_DIR}/fbthrift
+  git apply ${VELOX_HOME:-${DEPENDENCY_DIR}/../}/CMake/resolve_dependency_modules/fbthrift/compactv1-protocol-refiller.patch 2>/dev/null || true
+  cd ${DEPENDENCY_DIR}
   cmake_install_dir fbthrift -Denable_tests=OFF -DBUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF
 }
 

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,5 @@`
`15`	`15`	`"baseline": "a7b6122f6b6504d16d96117336a0562693579933",`
`16`	`16`	`"packages": [ "upb"]`
`17`	`17`	`}`
`18`		`-`
`19`	`18`	`]`
`20`	`19`	`}`