This is an automated email from the ASF dual-hosted git repository.
zhouyuan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 06e0008bd0 [VL] Fix gflags mode in folly on Centos9 (#12265)
06e0008bd0 is described below
commit 06e0008bd0d358c6cd594c7137dad04a2d047ad4
Author: Yuan <[email protected]>
AuthorDate: Tue Jun 9 21:56:47 2026 +0800
[VL] Fix gflags mode in folly on Centos9 (#12265)
on dynamic lib testing env, the gflags_shared need to enabled in folly
Remove the workaround for folly gflags mode on centos9 image introduced in
#12223
Signed-off-by: Yuan <[email protected]>
---
.github/workflows/velox_backend_arm.yml | 1 -
.github/workflows/velox_backend_x86.yml | 1 -
dev/docker/Dockerfile.centos8-dynamic-build | 1 +
dev/docker/Dockerfile.centos9-dynamic-build | 1 +
ep/build-velox/src/get-velox.sh | 1 -
5 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/velox_backend_arm.yml
b/.github/workflows/velox_backend_arm.yml
index f7346b64b2..bbbe4fba6c 100644
--- a/.github/workflows/velox_backend_arm.yml
+++ b/.github/workflows/velox_backend_arm.yml
@@ -150,7 +150,6 @@ jobs:
- name: Build Gluten native libraries
run: |
df -a
- sed -i "s|gflags_static|gflags_shared|g"
/usr/local/lib/cmake/folly/folly-targets.cmake # TODO: remove after upgrading
folly to 2024.09.30 or later which has fixed the gflags linkage issue
bash dev/ci-velox-buildshared-centos-9.sh
ccache -s
- name: Run CPP unit test
diff --git a/.github/workflows/velox_backend_x86.yml
b/.github/workflows/velox_backend_x86.yml
index 8129beac8e..159ed22b61 100644
--- a/.github/workflows/velox_backend_x86.yml
+++ b/.github/workflows/velox_backend_x86.yml
@@ -1181,7 +1181,6 @@ jobs:
- name: Build Gluten native libraries
run: |
df -a
- sed -i "s|gflags_static|gflags_shared|g"
/usr/local/lib/cmake/folly/folly-targets.cmake # TODO remove after image update
bash dev/ci-velox-buildshared-centos-9.sh
ccache -s
- name: Run CPP unit test
diff --git a/dev/docker/Dockerfile.centos8-dynamic-build
b/dev/docker/Dockerfile.centos8-dynamic-build
index ff1fb48a86..aa3bc39882 100644
--- a/dev/docker/Dockerfile.centos8-dynamic-build
+++ b/dev/docker/Dockerfile.centos8-dynamic-build
@@ -51,6 +51,7 @@ RUN set -ex; \
fi; \
cd /opt/gluten; \
source /opt/rh/gcc-toolset-11/enable; \
+ export VELOX_BUILD_SHARED=ON; \
./dev/builddeps-veloxbe.sh --run_setup_script=ON build_arrow; \
./build/mvn dependency:go-offline -Pbackends-velox -Piceberg -Pdelta
-Pspark-3.5 -DskipTests; \
dnf clean all; \
diff --git a/dev/docker/Dockerfile.centos9-dynamic-build
b/dev/docker/Dockerfile.centos9-dynamic-build
index 4c490d3477..f160164099 100644
--- a/dev/docker/Dockerfile.centos9-dynamic-build
+++ b/dev/docker/Dockerfile.centos9-dynamic-build
@@ -47,6 +47,7 @@ RUN set -ex; \
fi; \
cd /opt/gluten; \
source /opt/rh/gcc-toolset-12/enable; \
+ export VELOX_BUILD_SHARED=ON; \
./dev/builddeps-veloxbe.sh --run_setup_script=ON build_arrow; \
./build/mvn dependency:go-offline -Pbackends-velox -Piceberg -Pdelta
-Pspark-3.5 -DskipTests; \
dnf clean all; \
diff --git a/ep/build-velox/src/get-velox.sh b/ep/build-velox/src/get-velox.sh
index 73e3af15fa..0a577faa11 100755
--- a/ep/build-velox/src/get-velox.sh
+++ b/ep/build-velox/src/get-velox.sh
@@ -69,7 +69,6 @@ function process_setup_ubuntu {
}
function process_setup_centos9 {
- sed -i "s|-DGFLAGS_SHARED=FALSE|-DGFLAGS_SHARED=TRUE|g"
scripts/setup-common.sh
echo "Using setup script from Velox"
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
