Skip to content

Commit c7f0e97

Browse files
committed
Merge bitcoin/bitcoin#28938: msvc: Update vcpkg manifest
6d05c4f msvc: Specify `boost-date-time` package explicitly (Hennadii Stepanov) 1f97e51 msvc: Update vcpkg manifest baseline up to "2023.08.09 Release" (Hennadii Stepanov) 2d2ef2f msvc: No need to specify the default feature for `libevent` package (Hennadii Stepanov) Pull request description: Last time we updated dependency packages used when compiling with MSVC in bitcoin/bitcoin#26891. Then we [switched](bitcoin/bitcoin#27335) to specifying the `builtin-baseline` in the `vcpkg.json` manifest file, which made checking out the entire vcpkg repository to a specific commit or tag unneeded. This PR updates the manifest baseline from [2023.01.09](https://github.com/microsoft/vcpkg/releases/tag/2023.01.09) to [2023.08.09](https://github.com/microsoft/vcpkg/releases/tag/2023.08.09): - berkeleydb: 4.8.30#8 --> 4.8.30#9 - boost: 1.81.0 --> 1.82.0#2 - sqlite3: 3.40.0#1 --> 3.42.0#1 - zeromq: 4.3.4#6 --> 2023-06-20#1 The most recent https://github.com/microsoft/vcpkg/releases/tag/2023.11.20 tag is still unavailable in the vcpkg installation in the current GHA Windows image (the head commit is microsoft/vcpkg@2b14b60 only). The other https://github.com/microsoft/vcpkg/releases/tag/2023.10.19 tag [introduces](boostorg/process@0c42a58) a warning C4297 in the Boost.Process 1.83 that is [fixed](boostorg/process#340) in the upcoming version 1.84. ACKs for top commit: fanquake: ACK 6d05c4f Tree-SHA512: c71c46c13ad5a6d39ae72982b7765f690e7391092e4983887a53dceeee507c8fc256e887351bbe35c051bf88d2babeb283e17a2588ee86ec9020c4ba426bfcd7
2 parents 05d3f8e + 6d05c4f commit c7f0e97

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

build_msvc/vcpkg.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,16 @@
33
"version-string": "1",
44
"dependencies": [
55
"berkeleydb",
6+
"boost-date-time",
67
"boost-multi-index",
78
"boost-process",
89
"boost-signals2",
910
"boost-test",
11+
"libevent",
1012
"sqlite3",
11-
{
12-
"name": "libevent",
13-
"features": ["thread"]
14-
},
1513
"zeromq"
1614
],
17-
"builtin-baseline": "f14984af3738e69f197bf0e647a8dca12de92996",
15+
"builtin-baseline": "9edb1b8e590cc086563301d735cae4b6e732d2d2",
1816
"overrides": [
1917
{
2018
"name": "libevent",

0 commit comments

Comments
 (0)