Skip to content

Commit

Permalink
[GLUTEN-7480][VL] Clean up code for protobuf install (#7473)
Browse files Browse the repository at this point in the history
As required changes for upstream velox have been merged, see facebookincubator/velox#11219, this pr removes some useless code in Gluten.
  • Loading branch information
PHILO-HE authored Oct 11, 2024
1 parent d8fd519 commit f46f86d
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions ep/build-velox/src/get_velox.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit f46f86d

Please sign in to comment.