From 1b87ae998db67c9e81b6b3cef2460fa32ca67f0c Mon Sep 17 00:00:00 2001 From: Yuan Date: Fri, 8 Dec 2023 09:14:52 +0800 Subject: [PATCH] [VL] Quick fix for static build git conflict (#3971) --- dev/vcpkg/setup-build-depends.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dev/vcpkg/setup-build-depends.sh b/dev/vcpkg/setup-build-depends.sh index 0afc32d8e2d4..0bbc194be36a 100755 --- a/dev/vcpkg/setup-build-depends.sh +++ b/dev/vcpkg/setup-build-depends.sh @@ -38,11 +38,11 @@ install_centos_7() { java-1.8.0-openjdk java-1.8.0-openjdk-devel # git>2.7.4 - if [[ "$(git --version)" != "git version 2."* ]]; then - [ -f /etc/yum.repos.d/ius.repo ] || yum -y install https://repo.ius.io/ius-release-el7.rpm - yum -y remove git - yum -y install git236 - fi + #if [[ "$(git --version)" != "git version 2."* ]]; then + # [ -f /etc/yum.repos.d/ius.repo ] || yum -y install https://repo.ius.io/ius-release-el7.rpm + # yum -y remove git + # yum -y install git236 + #fi # flex>=2.6.0 if [[ "$(PATH="/usr/local/bin:$PATH" flex --version 2>&1)" != "flex 2.6."* ]]; then @@ -148,4 +148,4 @@ INSTALL_FUNC="install_${OS_ID}_${OS_VERSION_ID}" set -x $INSTALL_FUNC -echo "Success" >&2 \ No newline at end of file +echo "Success" >&2