Skip to content

Commit 8c19928

Browse files
authored
Update vcpkg baseline to fix build for gcc 14 (#588)
Signed-off-by: Adam Glustein <[email protected]>
1 parent 6733992 commit 8c19928

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,11 +193,11 @@ dependencies-mac: ## install dependencies for mac
193193
HOMEBREW_NO_AUTO_UPDATE=1 brew bundle install
194194
brew unlink bison flex && brew link --force bison flex
195195

196-
dependencies-debian: ## install dependencies for linux
197-
apt-get install -y autoconf autoconf-archive automake bison cmake curl flex libtool ninja-build pkg-config tar unzip
196+
dependencies-debian: ## install dependencies for linux - note that zip is needed by bootstrap_vcpkg.sh, do not remove
197+
apt-get install -y autoconf autoconf-archive automake bison cmake curl flex libtool ninja-build pkg-config tar unzip zip
198198

199-
dependencies-fedora: ## install dependencies for linux
200-
yum install -y autoconf autoconf-archive automake bison ccache cmake curl flex libtool perl-IPC-Cmd pkg-config tar unzip
199+
dependencies-fedora: ## install dependencies for linux - note that zip is needed by bootstrap_vcpkg.sh, do not remove
200+
yum install -y autoconf autoconf-archive automake bison ccache cmake curl flex libtool perl-IPC-Cmd pkg-config tar unzip zip
201201

202202
dependencies-vcpkg: ## install dependencies via vcpkg
203203
cd vcpkg && ./bootstrap-vcpkg.sh && ./vcpkg install

vcpkg

Submodule vcpkg updated 3659 files

vcpkg.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "main",
33
"version-string": "latest",
44
"dependencies": [
5-
{ "name": "arrow", "version>=": "19.0.1" },
5+
"arrow",
66
"boost-beast",
77
"boost-multi-index",
88
"brotli",
@@ -37,5 +37,11 @@
3737
"thrift",
3838
"utf8proc"
3939
],
40-
"builtin-baseline": "0bf1354d6704ec797acea686d0250afc4036a082"
40+
"overrides": [
41+
{
42+
"name": "arrow",
43+
"version": "19.0.1"
44+
}
45+
],
46+
"builtin-baseline": "b94ade01f19e4436d8c8a16a5c52e8c802ef67dd"
4147
}

0 commit comments

Comments
 (0)