Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[VL] quick fix for static build git conflict #3971

Merged
merged 1 commit into from
Dec 8, 2023
Merged

[VL] quick fix for static build git conflict #3971

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions dev/vcpkg/setup-build-depends.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -148,4 +148,4 @@ INSTALL_FUNC="install_${OS_ID}_${OS_VERSION_ID}"
set -x
$INSTALL_FUNC

echo "Success" >&2
echo "Success" >&2
Loading