[VL] Quick fix for static build git conflict (#3971)

apache · Dec 8, 2023 · 1b87ae9 · 1b87ae9
1 parent 9c5314f
commit 1b87ae9
Showing 1 changed file with 6 additions and 6 deletions.
diff --git 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
+echo "Success" >&2