Skip to content

Commit b1d0de7

Browse files
rustyconoverclaude
andcommitted
fix: add blake3 overlay port to fix vcpkg build failure
The pinned vcpkg commit has blake3 1.8.2 whose patch download hash changed on GitHub, breaking all CI builds. Add a local overlay port with blake3 1.8.3 (from upstream vcpkg) which removes the problematic patch download. Also remove non-existent overlay-triplets path. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent a2d4564 commit b1d0de7

4 files changed

Lines changed: 73 additions & 3 deletions

File tree

vcpkg.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@
55
],
66
"vcpkg-configuration": {
77
"overlay-ports": [
8+
"./vcpkg_overlay_ports",
89
"./extension-ci-tools/vcpkg_ports"
9-
],
10-
"overlay-triplets": [
11-
"./extension-ci-tools/toolchains"
1210
]
1311
}
1412
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/c/blake3_dispatch.c b/c/blake3_dispatch.c
2+
index af6c3da..dce85b4 100644
3+
--- a/c/blake3_dispatch.c
4+
+++ b/c/blake3_dispatch.c
5+
@@ -31,7 +31,7 @@
6+
#define ATOMIC_INT _Atomic int
7+
#define ATOMIC_LOAD(x) x
8+
#define ATOMIC_STORE(x, y) x = y
9+
-#elif defined(_MSC_VER)
10+
+#elif defined(IS_X86) && defined(_MSC_VER)
11+
#define ATOMIC_INT LONG
12+
#define ATOMIC_LOAD(x) InterlockedOr(&x, 0)
13+
#define ATOMIC_STORE(x, y) InterlockedExchange(&x, y)
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
vcpkg_from_github(
2+
OUT_SOURCE_PATH SOURCE_PATH
3+
REPO BLAKE3-team/BLAKE3
4+
REF "${VERSION}"
5+
SHA512 d0861c3c0294d84a46a3760e5e51734f4040036aa74d72d32242adb9311c0f85f580c17fbee9ca17dc2b3818ff68048b3156a19b8d11fe5c459c5e9266709fb9
6+
HEAD_REF main
7+
PATCHES
8+
fix-windows-arm-build-error.patch
9+
)
10+
11+
vcpkg_check_features(
12+
OUT_FEATURE_OPTIONS BLAKE3_FEATURE_OPTIONS
13+
FEATURES
14+
tbb BLAKE3_USE_TBB
15+
)
16+
17+
vcpkg_cmake_configure(
18+
SOURCE_PATH "${SOURCE_PATH}/c"
19+
OPTIONS
20+
${BLAKE3_FEATURE_OPTIONS}
21+
-DBLAKE3_FETCH_TBB=OFF
22+
-DBLAKE3_EXAMPLES=OFF
23+
)
24+
25+
vcpkg_cmake_install()
26+
27+
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
28+
vcpkg_fixup_pkgconfig()
29+
30+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
31+
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE_A2" "${SOURCE_PATH}/LICENSE_A2LLVM" "${SOURCE_PATH}/LICENSE_CC0")
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"name": "blake3",
3+
"version": "1.8.3",
4+
"description": "BLAKE3 cryptographic hash function.",
5+
"homepage": "https://github.com/BLAKE3-team/BLAKE3",
6+
"license": "CC0-1.0 OR Apache-2.0",
7+
"dependencies": [
8+
{
9+
"name": "vcpkg-cmake",
10+
"host": true
11+
},
12+
{
13+
"name": "vcpkg-cmake-config",
14+
"host": true
15+
}
16+
],
17+
"features": {
18+
"tbb": {
19+
"description": "Enable TBB multi-threading API support",
20+
"dependencies": [
21+
{
22+
"name": "tbb",
23+
"default-features": false
24+
}
25+
]
26+
}
27+
}
28+
}

0 commit comments

Comments
 (0)