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 4017788a1e [GLUTEN-9798][VL] Cleanup setup scripts for ubuntu/centos
(#9799)
4017788a1e is described below
commit 4017788a1e5d782d844260528bb2a49ccff02e44
Author: Yuan <[email protected]>
AuthorDate: Wed Jul 2 15:56:17 2025 +0100
[GLUTEN-9798][VL] Cleanup setup scripts for ubuntu/centos (#9799)
This patch removed the local changes on setup scripts from Velox repo.
Also cleaned up some unused dependencies in Centos-7/8
Signed-off-by: Yuan <[email protected]>
---
.github/workflows/velox_weekly.yml | 66 +++++++++++++++++++---
.../gluten/utils/SharedLibraryLoaderCentos7.scala | 3 +-
.../gluten/utils/SharedLibraryLoaderCentos8.scala | 4 +-
.../gluten/utils/SharedLibraryLoaderCentos9.scala | 4 +-
dev/build-thirdparty.sh | 12 ++--
dev/build_arrow.sh | 3 +-
dev/builddeps-veloxbe.sh | 2 +-
dev/package.sh | 2 +-
ep/build-velox/src/get_velox.sh | 57 +------------------
ep/build-velox/src/setup-centos7.sh | 2 +-
ep/build-velox/src/setup-centos8.sh | 8 ---
11 files changed, 75 insertions(+), 88 deletions(-)
diff --git a/.github/workflows/velox_weekly.yml
b/.github/workflows/velox_weekly.yml
index aaa04d9fb1..67cc7de238 100644
--- a/.github/workflows/velox_weekly.yml
+++ b/.github/workflows/velox_weekly.yml
@@ -28,21 +28,62 @@ env:
SETUP: 'bash .github/workflows/util/setup_helper.sh'
TPCH_TEST: "env GLUTEN_IT_JVM_ARGS=-Xmx5G sbin/gluten-it.sh queries-compare
--local --preset=velox --benchmark-type=h --error-on-memleak
--off-heap-size=10g -s=1.0 --threads=16 --iterations=1"
+ INSTALL_PREFIX: /usr/local
+
concurrency:
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{
github.workflow }}
cancel-in-progress: true
jobs:
+ # action/checkout does not work centos7 anymore, so we clone the main branch
instead
+ 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
+ wget --no-check-certificate
https://downloads.apache.org/maven/maven-3/3.8.9/binaries/apache-maven-3.8.9-bin.tar.gz
&& \
+ tar -xvf apache-maven*bin.tar.gz && \
+ mv apache-maven-3.8.9 /usr/lib/maven && \
+ export MAVEN_HOME=/usr/lib/maven && \
+ export PATH=${PATH}:${MAVEN_HOME}/bin && \
+ ln -s /usr/lib/maven/bin /usr/bin/mvn
+ ls -l /usr/bin/mvn
+
+ git clone -b main --depth=1
https://github.com/apache/incubator-gluten.git && cd incubator-gluten/
+ ./dev/package.sh
+
+
build-on-centos:
strategy:
fail-fast: false
matrix:
- os: [ "centos:7", "centos:8", "quay.io/centos/centos:stream9" ]
+ os: [ "centos:8", "quay.io/centos/centos:stream9" ]
if: ${{ startsWith(github.repository, 'apache/') }}
runs-on: ubuntu-22.04
container: ${{ matrix.os }}
steps:
+ - uses: actions/checkout@v4
- name: Update mirror list
run: |
sed -i -e "s|mirrorlist=|#mirrorlist=|g" /etc/yum.repos.d/CentOS-*
|| true
@@ -71,11 +112,12 @@ jobs:
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
- git clone -b main --depth=1
https://github.com/apache/incubator-gluten.git && cd incubator-gluten/
+
$SETUP install_maven
export MAVEN_HOME=/usr/lib/maven && \
- export PATH=${PATH}:${MAVEN_HOME}/bin && \
- ./dev/package.sh
+ export PATH=${PATH}:${MAVEN_HOME}/bin
+
+ cd $GITHUB_WORKSPACE/ && ./dev/package.sh
build-on-ubuntu:
strategy:
@@ -89,17 +131,27 @@ jobs:
- uses: actions/checkout@v4
- name: build
run: |
+ # sed -i 's|http://archive|http://us.archive|g' /etc/apt/sources.list
# To avoid the prompt for region selection during installing tzdata.
export DEBIAN_FRONTEND=noninteractive
- apt-get update && apt-get install -y sudo maven wget git
+ apt-get update && apt-get install -y sudo maven wget git curl
if [ "${{ matrix.os }}" = "ubuntu:20.04" ]; then
sudo apt install -y software-properties-common
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
- sudo apt update && sudo apt install -y gcc-11 g++-11
+ sudo apt update && sudo apt install -y gcc-11 g++-11
build-essential cmake
export CC=/usr/bin/gcc-11
export CXX=/usr/bin/g++-11
+ wget
https://github.com/Cyan4973/xxHash/archive/refs/tags/v0.8.1.tar.gz
+ tar xf v0.8.1.tar.gz
+ cd xxHash-0.8.1/
+ make && make install
+ cd /tmp
+ wget
https://github.com/google/googletest/archive/refs/tags/v1.13.0.tar.gz
+ tar xf v1.13.0.tar.gz && cd googletest-1.13.0/
+ export CXXFLAGS=-fPIC
+ cmake . && make install -j
fi
- sudo apt-get install -y openjdk-8-jdk
+ 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
diff --git
a/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos7.scala
b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos7.scala
index 56badac907..0ae9bbd5eb 100755
---
a/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos7.scala
+++
b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos7.scala
@@ -31,11 +31,10 @@ class SharedLibraryLoaderCentos7 extends
SharedLibraryLoader {
loader.loadAndCreateLink("libevent-2.0.so.5", "libevent-2.0.so")
loader.loadAndCreateLink("libgflags.so.2.2", "libgflags.so")
loader.loadAndCreateLink("libglog.so.0", "libglog.so")
- loader.loadAndCreateLink("libntlm.so.0", "libntlm.so")
- loader.loadAndCreateLink("libgsasl.so.7", "libgsasl.so")
loader.loadAndCreateLink("libprotobuf.so.32", "libprotobuf.so")
loader.loadAndCreateLink("libre2.so.10", "libre2.so")
loader.loadAndCreateLink("libzstd.so.1", "libzstd.so")
loader.loadAndCreateLink("liblz4.so.1", "liblz4.so")
+ loader.loadAndCreateLink("libgeos.so.3.10.7", "libgeos.so")
}
}
diff --git
a/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos8.scala
b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos8.scala
index d049b73cc3..f0882ea8f1 100755
---
a/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos8.scala
+++
b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos8.scala
@@ -35,11 +35,9 @@ class SharedLibraryLoaderCentos8 extends SharedLibraryLoader
{
loader.loadAndCreateLink("libgflags.so.2.2", "libgflags.so")
loader.loadAndCreateLink("libglog.so.1", "libglog.so")
loader.loadAndCreateLink("libdwarf.so.1", "libdwarf.so")
- loader.loadAndCreateLink("libidn.so.11", "libidn.so")
- loader.loadAndCreateLink("libntlm.so.0", "libntlm.so")
- loader.loadAndCreateLink("libgsasl.so.7", "libgsasl.so")
loader.loadAndCreateLink("libprotobuf.so.32", "libprotobuf.so")
loader.loadAndCreateLink("libre2.so.0", "libre2.so")
loader.loadAndCreateLink("libsodium.so.23", "libsodium.so")
+ loader.loadAndCreateLink("libgeos.so.3.10.7", "libgeos.so")
}
}
diff --git
a/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos9.scala
b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos9.scala
index fa50c2fcc6..dea336cb36 100755
---
a/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos9.scala
+++
b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos9.scala
@@ -35,11 +35,9 @@ class SharedLibraryLoaderCentos9 extends SharedLibraryLoader
{
loader.loadAndCreateLink("libgflags.so.2.2", "libgflags.so")
loader.loadAndCreateLink("libglog.so.1", "libglog.so")
loader.loadAndCreateLink("libdwarf.so.0", "libdwarf.so")
- loader.loadAndCreateLink("libidn.so.12", "libidn.so")
- loader.loadAndCreateLink("libntlm.so.0", "libntlm.so")
- loader.loadAndCreateLink("libgsasl.so.7", "libgsasl.so")
loader.loadAndCreateLink("libprotobuf.so.32", "libprotobuf.so")
loader.loadAndCreateLink("libre2.so.9", "libre2.so")
loader.loadAndCreateLink("libsodium.so.23", "libsodium.so")
+ loader.loadAndCreateLink("libgeos.so.3.10.7", "libgeos.so")
}
}
diff --git a/dev/build-thirdparty.sh b/dev/build-thirdparty.sh
index 1aa6d51182..1fb9ab51b3 100755
--- a/dev/build-thirdparty.sh
+++ b/dev/build-thirdparty.sh
@@ -26,24 +26,24 @@ ARCH=`uname -m`
mkdir -p $THIRDPARTY_LIB
function process_setup_ubuntu_2004 {
- cp
/usr/lib/${ARCH}-linux-gnu/{libroken.so.18,libasn1.so.8,libcrypto.so.1.1,libnghttp2.so.14,libnettle.so.7,libhogweed.so.5,librtmp.so.1,libssh.so.4,libssl.so.1.1,liblber-2.4.so.2,libsasl2.so.2,libwind.so.0,libheimbase.so.1,libhcrypto.so.4,libhx509.so.5,libkrb5.so.26,libheimntlm.so.0,libgssapi.so.3,libldap_r-2.4.so.2,libcurl.so.4,libdouble-conversion.so.3,libevent-2.1.so.7,libgflags.so.2.2,libunwind.so.8,libglog.so.0,libidn.so.11,libntlm.so.0,libgsasl.so.7,libicudata.so.66,libicuuc.so.
[...]
+ cp
/usr/lib/${ARCH}-linux-gnu/{libroken.so.18,libasn1.so.8,libcrypto.so.1.1,libnghttp2.so.14,libnettle.so.7,libhogweed.so.5,librtmp.so.1,libssh.so.4,libssl.so.1.1,liblber-2.4.so.2,libsasl2.so.2,libwind.so.0,libheimbase.so.1,libhcrypto.so.4,libhx509.so.5,libkrb5.so.26,libheimntlm.so.0,libgssapi.so.3,libldap_r-2.4.so.2,libcurl.so.4,libdouble-conversion.so.3,libevent-2.1.so.7,libgflags.so.2.2,libunwind.so.8,libglog.so.0,libicudata.so.66,libicuuc.so.66,libxml2.so.2,libre2.so.5,libsnappy.so
[...]
cp /usr/local/lib/{libboost_context.so.1.84.0,libboost_regex.so.1.84.0}
$THIRDPARTY_LIB/
}
function process_setup_ubuntu_2204 {
- cp
/usr/lib/${ARCH}-linux-gnu/{libre2.so.9,libdouble-conversion.so.3,libidn.so.12,libglog.so.0,libgflags.so.2.2,libevent-2.1.so.7,libsnappy.so.1,libunwind.so.8,libcurl.so.4,libxml2.so.2,libgsasl.so.7,libicui18n.so.70,libicuuc.so.70,libnghttp2.so.14,libldap-2.5.so.0,liblber-2.5.so.0,libntlm.so.0,librtmp.so.1,libsasl2.so.2,libssh.so.4,libicudata.so.70,libthrift-0.16.0.so}
$THIRDPARTY_LIB/
+ cp
/usr/lib/${ARCH}-linux-gnu/{libre2.so.9,libdouble-conversion.so.3,libglog.so.0,libgflags.so.2.2,libevent-2.1.so.7,libsnappy.so.1,libunwind.so.8,libcurl.so.4,libxml2.so.2,libicui18n.so.70,libicuuc.so.70,libnghttp2.so.14,libldap-2.5.so.0,liblber-2.5.so.0,librtmp.so.1,libsasl2.so.2,libssh.so.4,libicudata.so.70}
$THIRDPARTY_LIB/
cp /usr/local/lib/{libboost_context.so.1.84.0,libboost_regex.so.1.84.0}
$THIRDPARTY_LIB/
}
function process_setup_centos_9 {
- cp
/lib64/{libre2.so.9,libdouble-conversion.so.3,libevent-2.1.so.7,libdwarf.so.0,libgsasl.so.7,libicudata.so.67,libicui18n.so.67,libicuuc.so.67,libidn.so.12,libntlm.so.0,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,libprotobuf.so.32}
$THIRDPARTY_LIB/
+ 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/lib64/{libgflags.so.2.2,libglog.so.1} $THIRDPARTY_LIB/
}
function process_setup_centos_8 {
- cp
/usr/lib64/{libre2.so.0,libdouble-conversion.so.3,libevent-2.1.so.6,libdwarf.so.1,libgsasl.so.7,libicudata.so.60,libicui18n.so.60,libicuuc.so.60,libidn.so.11,libntlm.so.0,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,libprotobuf.so.32}
$THIRDPARTY_LIB/
+ cp
/usr/lib64/{libre2.so.0,libdouble-conversion.so.3,libevent-2.1.so.6,libdwarf.so.1,libicudata.so.60,libicui18n.so.60,libicuuc.so.60,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/lib64/{libgflags.so.2.2,libglog.so.1} $THIRDPARTY_LIB/
}
diff --git a/dev/build_arrow.sh b/dev/build_arrow.sh
index a3e60539e4..ebee940ccb 100755
--- a/dev/build_arrow.sh
+++ b/dev/build_arrow.sh
@@ -26,7 +26,8 @@ BUILD_TYPE=Release
function prepare_arrow_build() {
mkdir -p ${ARROW_PREFIX}/../ && pushd ${ARROW_PREFIX}/../ && sudo rm -rf
arrow_ep/
- wget_and_untar
https://archive.apache.org/dist/arrow/arrow-${VELOX_ARROW_BUILD_VERSION}/apache-arrow-${VELOX_ARROW_BUILD_VERSION}.tar.gz
arrow_ep
+ wget_and_untar
https://github.com/apache/arrow/archive/refs/tags/apache-arrow-${VELOX_ARROW_BUILD_VERSION}/.tar.gz
arrow_ep
+ #wget_and_untar
https://archive.apache.org/dist/arrow/arrow-${VELOX_ARROW_BUILD_VERSION}/apache-arrow-${VELOX_ARROW_BUILD_VERSION}.tar.gz
arrow_ep
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
diff --git a/dev/builddeps-veloxbe.sh b/dev/builddeps-veloxbe.sh
index d7548cd8fa..876ab96897 100755
--- a/dev/builddeps-veloxbe.sh
+++ b/dev/builddeps-veloxbe.sh
@@ -213,7 +213,7 @@ concat_velox_param
function build_arrow {
cd $GLUTEN_DIR/dev
- ./build_arrow.sh
+ source ./build_arrow.sh
}
function build_velox {
diff --git a/dev/package.sh b/dev/package.sh
index 7f042a5e24..03440652fc 100755
--- a/dev/package.sh
+++ b/dev/package.sh
@@ -31,7 +31,7 @@ fi
# build gluten with velox backend, prompt always respond y
export PROMPT_ALWAYS_RESPOND=y
-./dev/buildbundle-veloxbe.sh --enable_vcpkg=OFF --build_tests=ON
--build_benchmarks=ON --enable_s3=ON --enable_hdfs=ON "$@"
+./dev/buildbundle-veloxbe.sh --enable_vcpkg=OFF --build_tests=ON
--build_benchmarks=ON --enable_s3=ON --enable_hdfs=ON "$@"
# make thirdparty package
./dev/build-thirdparty.sh
diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh
index ff9989f413..c8c69dd1df 100755
--- a/ep/build-velox/src/get_velox.sh
+++ b/ep/build-velox/src/get_velox.sh
@@ -76,64 +76,11 @@ function ensure_pattern_matched {
}
function process_setup_ubuntu {
- if [ -z "$(which git)" ]; then
- sudo --preserve-env apt install -y git
- fi
- # make this function Reentrant
- git checkout scripts/setup-ubuntu.sh
-
- # No need to re-install git.
- ensure_pattern_matched 'git ' scripts/setup-ubuntu.sh
- sed -i '/git \\/d' scripts/setup-ubuntu.sh
- # Do not install libunwind which can cause interruption when catching native
exception.
- ensure_pattern_matched '\${SUDO} apt install -y libunwind-dev'
scripts/setup-ubuntu.sh
- sed -i 's/${SUDO} apt install -y libunwind-dev//' scripts/setup-ubuntu.sh
- ensure_pattern_matched 'ccache' scripts/setup-ubuntu.sh
- sed -i '/ccache/a\ *thrift* \\' scripts/setup-ubuntu.sh
- sed -i '/ccache/a\ libiberty-dev \\' scripts/setup-ubuntu.sh
- sed -i '/ccache/a\ libxml2-dev \\' scripts/setup-ubuntu.sh
- sed -i '/ccache/a\ libkrb5-dev \\' scripts/setup-ubuntu.sh
- sed -i '/ccache/a\ libgsasl7-dev \\' scripts/setup-ubuntu.sh
- sed -i '/ccache/a\ libuuid1 \\' scripts/setup-ubuntu.sh
- sed -i '/ccache/a\ uuid-dev \\' scripts/setup-ubuntu.sh
- ensure_pattern_matched 'libgmock-dev' scripts/setup-ubuntu.sh
- sed -i '/libgmock-dev/d' scripts/setup-ubuntu.sh # resolved by
ep/build-velox/build/velox_ep/CMake/resolve_dependency_modules/gtest.cmake
- # Required by lib hdfs.
- ensure_pattern_matched 'ccache ' scripts/setup-ubuntu.sh
- sed -i '/ccache /a\ yasm \\' scripts/setup-ubuntu.sh
- ensure_pattern_matched 'run_and_time install_conda' scripts/setup-ubuntu.sh
- sed -i '/run_and_time install_conda/d' scripts/setup-ubuntu.sh
- # Just depends on Gluten to install arrow libs since Gluten requires some
patches are applied and some different build options are used.
- ensure_pattern_matched 'run_and_time install_arrow' scripts/setup-ubuntu.sh
- sed -i '/run_and_time install_arrow/d' scripts/setup-ubuntu.sh
+ echo "Using setup script from Velox"
}
function process_setup_centos9 {
- # Allows other version of git already installed.
- if [ -z "$(which git)" ]; then
- dnf install -y -q --setopt=install_weak_deps=False git
- fi
- # make this function Reentrant
- git checkout scripts/setup-centos9.sh
- # No need to re-install git.
-
- ensure_pattern_matched 'dnf_install' scripts/setup-centos9.sh
- sed -i 's/dnf_install ninja-build cmake curl ccache gcc-toolset-12
git/dnf_install ninja-build cmake curl ccache gcc-toolset-12/'
scripts/setup-centos9.sh
- sed -i '/^.*dnf_install autoconf/a\ dnf_install libxml2-devel
libgsasl-devel libuuid-devel' scripts/setup-centos9.sh
-
- ensure_pattern_matched 'install_gflags' scripts/setup-centos9.sh
- sed -i '/^function install_gflags.*/i function install_openssl {\n
wget_and_untar
https://github.com/openssl/openssl/releases/download/openssl-3.2.2/openssl-3.2.2.tar.gz
openssl \n ( cd ${DEPENDENCY_DIR}/openssl \n ./config no-shared && make
depend && make && sudo make install ) \n}\n' scripts/setup-centos9.sh
-
- ensure_pattern_matched 'install_fbthrift' scripts/setup-centos9.sh
- sed -i '/^ run_and_time install_fbthrift/a \ run_and_time install_openssl'
scripts/setup-centos9.sh
-
- # Required by lib hdfs.
- ensure_pattern_matched 'dnf_install ninja-build' scripts/setup-centos9.sh
- sed -i '/^ dnf_install ninja-build/a\ dnf_install yasm\'
scripts/setup-centos9.sh
-
- # Just depends on Gluten to install arrow libs since Gluten requires some
patches are applied and some different build options are used.
- ensure_pattern_matched 'run_and_time install_arrow' scripts/setup-centos9.sh
- sed -i '/run_and_time install_arrow/d' scripts/setup-centos9.sh
+ echo "Using setup script from Velox"
}
function process_setup_alinux3 {
diff --git a/ep/build-velox/src/setup-centos7.sh
b/ep/build-velox/src/setup-centos7.sh
index 3fa110a40e..8de8cfc1c5 100755
--- a/ep/build-velox/src/setup-centos7.sh
+++ b/ep/build-velox/src/setup-centos7.sh
@@ -60,7 +60,7 @@ function install_cmake {
function install_ninja {
cd "${DEPENDENCY_DIR}"
- github_checkout ninja-build/ninja v1.11.1
+ github_checkout ninja-build/ninja v1.11.1 --depth 1
./configure.py --bootstrap
cmake -Bbuild-cmake
cmake --build build-cmake
diff --git a/ep/build-velox/src/setup-centos8.sh
b/ep/build-velox/src/setup-centos8.sh
index 0f13f75bd1..ffea04b1bf 100755
--- a/ep/build-velox/src/setup-centos8.sh
+++ b/ep/build-velox/src/setup-centos8.sh
@@ -79,13 +79,6 @@ function install_conda {
dnf_install conda
}
-function install_openssl {
- wget_and_untar
https://github.com/openssl/openssl/archive/refs/tags/OpenSSL_1_1_1s.tar.gz
openssl
- (
- cd ${DEPENDENCY_DIR}/openssl
- ./config no-shared && make depend && make && sudo make install
- )
-}
function install_gflags {
# Remove an older version if present.
@@ -200,7 +193,6 @@ function install_velox_deps {
run_and_time install_wangle
run_and_time install_mvfst
run_and_time install_fbthrift
- run_and_time install_openssl
run_and_time install_duckdb
run_and_time install_geos
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
