Skip to content

Commit 55321d9

Browse files
committed
[VL] Fix gflags mode in folly on Centos9
on dynamic lib testing env, the gflags_shared need to enabled in folly Signed-off-by: Yuan <yuanzhou@apache.org>
1 parent 7415d74 commit 55321d9

5 files changed

Lines changed: 2 additions & 3 deletions

File tree

.github/workflows/velox_backend_arm.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ jobs:
150150
- name: Build Gluten native libraries
151151
run: |
152152
df -a
153-
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
154153
bash dev/ci-velox-buildshared-centos-9.sh
155154
ccache -s
156155
- name: Run CPP unit test

.github/workflows/velox_backend_x86.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1181,7 +1181,6 @@ jobs:
11811181
- name: Build Gluten native libraries
11821182
run: |
11831183
df -a
1184-
sed -i "s|gflags_static|gflags_shared|g" /usr/local/lib/cmake/folly/folly-targets.cmake # TODO remove after image update
11851184
bash dev/ci-velox-buildshared-centos-9.sh
11861185
ccache -s
11871186
- name: Run CPP unit test

dev/docker/Dockerfile.centos8-dynamic-build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ RUN set -ex; \
5151
fi; \
5252
cd /opt/gluten; \
5353
source /opt/rh/gcc-toolset-11/enable; \
54+
export VELOX_BUILD_SHARED=ON; \
5455
./dev/builddeps-veloxbe.sh --run_setup_script=ON build_arrow; \
5556
./build/mvn dependency:go-offline -Pbackends-velox -Piceberg -Pdelta -Pspark-3.5 -DskipTests; \
5657
dnf clean all; \

dev/docker/Dockerfile.centos9-dynamic-build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ RUN set -ex; \
4747
fi; \
4848
cd /opt/gluten; \
4949
source /opt/rh/gcc-toolset-12/enable; \
50+
export VELOX_BUILD_SHARED=ON; \
5051
./dev/builddeps-veloxbe.sh --run_setup_script=ON build_arrow; \
5152
./build/mvn dependency:go-offline -Pbackends-velox -Piceberg -Pdelta -Pspark-3.5 -DskipTests; \
5253
dnf clean all; \

ep/build-velox/src/get-velox.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ function process_setup_ubuntu {
6969
}
7070

7171
function process_setup_centos9 {
72-
sed -i "s|-DGFLAGS_SHARED=FALSE|-DGFLAGS_SHARED=TRUE|g" scripts/setup-common.sh
7372
echo "Using setup script from Velox"
7473
}
7574

0 commit comments

Comments
 (0)