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 f46f86da62 [GLUTEN-7480][VL] Clean up code for protobuf install (#7473)
f46f86da62 is described below
commit f46f86da6270525f323ab85266589d5a0654e899
Author: PHILO-HE <[email protected]>
AuthorDate: Fri Oct 11 16:55:37 2024 +0800
[GLUTEN-7480][VL] Clean up code for protobuf install (#7473)
As required changes for upstream velox have been merged, see
facebookincubator/velox#11219, this pr removes some useless code in Gluten.
---
ep/build-velox/src/get_velox.sh | 8 --------
1 file changed, 8 deletions(-)
diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh
index 7d44b04ae0..66cd43ebe4 100755
--- a/ep/build-velox/src/get_velox.sh
+++ b/ep/build-velox/src/get_velox.sh
@@ -79,13 +79,6 @@ function process_setup_ubuntu {
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
- ensure_pattern_matched 'function install_folly' scripts/setup-ubuntu.sh
- sed -i '/^function install_folly.*/i function install_protobuf {\
- wget_and_untar
https://github.com/protocolbuffers/protobuf/releases/download/v21.4/protobuf-all-21.4.tar.gz
protobuf\
- (\n cd ${DEPENDENCY_DIR}/protobuf\n ./configure CXXFLAGS="-fPIC"
--prefix=${INSTALL_PREFIX}\n make "-j$(nproc)"\
- sudo make install\n sudo ldconfig\n )\n}\n' scripts/setup-ubuntu.sh
- ensure_pattern_matched ' run_and_time install_folly' scripts/setup-ubuntu.sh
- sed -i '/^ run_and_time install_folly/a \ \ run_and_time install_protobuf'
scripts/setup-ubuntu.sh
# Required by lib hdfs.
ensure_pattern_matched 'ccache ' scripts/setup-ubuntu.sh
sed -i '/ccache /a\ yasm \\' scripts/setup-ubuntu.sh
@@ -114,7 +107,6 @@ function process_setup_centos9 {
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
- sed -i '/cd ${DEPENDENCY_DIR}\/protobuf/{n;s/\.\/configure
--prefix=${INSTALL_PREFIX}/\.\/configure CXXFLAGS="-fPIC"
--prefix=${INSTALL_PREFIX}/;}' scripts/setup-centos9.sh
# Required by lib hdfs.
ensure_pattern_matched 'dnf_install ninja-build' scripts/setup-centos9.sh
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
