mirror of
https://github.com/open-goal/jak-project
synced 2026-08-11 03:26:33 -04:00
Alexander J. Semenuk
5d5e35fb9b
## Problem Windows builds break with a current local toolchain (Scoop LLVM 22.1.8, CMake 4.4.0, VS 2026), in two independent ways: 1. The build stops at curl's deliberate guard: `#error "no non-blocking method was found/used/set"` in `third-party/curl/lib/nonblock.c`. 2. From the second configure onward, `cmake --build` re-runs CMake in an endless loop (observed 42 consecutive reconfigure cycles in a single build). Likely the same mechanism behind the "endlessly building" VS 2026 note in `docs/setup/dev/vs.md`. ## Root cause 1. `third-party/curl/CMake/CurlTests.c` passes `int *` to `ioctlsocket()`, whose third parameter is `u_long *`. Clang 22 promotes `-Wincompatible-pointer-types` to a hard error in C, so the `HAVE_IOCTLSOCKET_FIONBIO` try_compile silently fails and `curl_config.h` never defines it. Upstream CI does not see this because the windows-2022 runner image ships an older LLVM. GCC 14 promotes the same warning to a hard error, which is very likely the `CurlTests.c.obj` failure reported from MSYS2 in open-goal/jak-project#3551. Upstream curl hit the identical problem with GCC 14 and fixed the probe in curl 8.8.0 (curl/curl#13578). 2. The root CMakeLists copies the build tree's `compile_commands.json` into `<src>/build/` for clangd using `configure_file()`, which registers its input as a configure dependency. CMake rewrites `compile_commands.json` late in every generation, after `CTestTestfile.cmake` and `cmake_install.cmake` (outputs of the same Ninja regen rule), so once the dependency is registered the rule is deterministically dirty and every `ninja` invocation re-runs CMake. A pristine first configure is safe (the file does not exist yet, so the `if(EXISTS ...)` guard skips the copy), which is why the loop looks machine- or IDE-specific. ## Fix 1. Per review, re-vendor `third-party/curl` at the `curl-8_21_0` tag (previously `curl-8_3_0`), which carries the upstream probe fix plus two years of upstream development; `vendor.yaml` updated to match. Adjustments the version jump forced: - curl 8.15 removed the native macOS Secure Transport backend (`CURL_USE_SECTRANSP`), so macOS now builds curl against OpenSSL like Linux. The two macOS workflows install Homebrew `openssl@3` and export `OPENSSL_ROOT_DIR` (keg-only), and the macOS setup docs gained the same two lines. - `CURL_BROTLI` / `CURL_ZSTD` switched to AUTO-detection in curl 8.10; pinned OFF to keep the previous no-compression behavior and avoid silently linking whatever the CI images happen to have. - curl's new top-level `BUILD_EXAMPLES` cache option (default ON) leaked into discord-rpc's identically named option and broke configure at a nonexistent `examples/send-presence` directory; pinned OFF ahead of the third-party subdirectories. The diff is dominated by the mechanical tag-tree swap under `third-party/curl` (linguist-vendored, collapsed in review). The hand-written changes are `CMakeLists.txt`, the two macOS workflows, `docs/setup/system/macos.md`, and `vendor.yaml`. 2. Swap `configure_file()` for `file(COPY ...)`: the same clangd copy with no configure dependency registered. (`file(COPY_FILE ... ONLY_IF_DIFFERENT)` would be cleaner still but requires CMake 3.21, above the declared `cmake_minimum_required(VERSION 3.10)`.) ## Test plan - [x] Fresh `cmake --preset Release-windows-clang` (LLVM 22, no cache seeding) completes and logs `Enabled SSL backends: Schannel`; the FIONBIO probe passes without the previous `#error` - [x] Full Windows Release build from scratch in the branch worktree (all 1422 targets) - [x] goalc-test suite: 1509 passed, 0 failed - [x] Second consecutive configure with `compile_commands.json` present: the regen rule in `build.ninja` has no `compile_commands.json` input; `<src>/build/compile_commands.json` is still refreshed for clangd - [x] Repeated `ninja` invocations after a full build no longer re-run CMake - [x] macOS Intel and ARM CI green (first exercise of the OpenSSL backend switch) --- I work off a self-hosted forge, so this GitHub account is quiet; the configure logs and ninja dirty-node traces from the investigation are available if anyone wants the raw data. (AI-assisted)
56 lines
2.2 KiB
YAML
56 lines
2.2 KiB
YAML
third-party/googletest:
|
|
sha: 14aa11db02d9851d957f93ef9fddb110c1aafdc6
|
|
third-party/zydis:
|
|
git: https://github.com/zyantific/zydis/commit/9bfadd6a55fc92dbd37fa3ba089bf8b36622df4f
|
|
third-party/discord-rpc:
|
|
sha: 963aa9f3e5ce81a4682c6ca3d136cddda614db33
|
|
modifications:
|
|
- "PR #3039 - Removes duplicate key in .clang-format"
|
|
third-party/fpng:
|
|
sha: bfe5f9c69e93b99b31268c10db8e645c9125a07f
|
|
modifications:
|
|
- "PR #1632 - Fixes Unicode path saving on windows"
|
|
third-party/CLI11.hpp:
|
|
git: https://github.com/CLIUtils/CLI11/tree/v2.2.0
|
|
third-party/xxhash.hpp:
|
|
git: https://github.com/RedSpah/xxhash_cpp/tree/0.7.3
|
|
third-party/xdelta3:
|
|
sha: 7508fd2a823443b1f0173ca361620f21d62a7d37
|
|
third-party/stb_image:
|
|
modifications:
|
|
- "PR #1632 - Uses UTF-8 on windows"
|
|
third-party/tiny_gltf:
|
|
modifications:
|
|
- "PR #1632 - Ensure stb_image is using UTF-8 on windows"
|
|
third-party/sqlite3:
|
|
release: sqlite-amalgamation-3420000
|
|
url: "https://www.sqlite.org/download.html"
|
|
third-party/fmt:
|
|
git: https://github.com/fmtlib/fmt/tree/11.1.4
|
|
third-party/SDL:
|
|
git: https://github.com/libsdl-org/SDL/tree/release-3.4.10
|
|
third-party/imgui:
|
|
git: https://github.com/ocornut/imgui/releases/tag/v1.92.6
|
|
third-party/tree-sitter:
|
|
git: https://github.com/tree-sitter/tree-sitter/tree/v0.22.1
|
|
third-party/replxx:
|
|
git: https://github.com/AmokHuginnsson/replxx/commit/1f149bfe20bf6e49c1afd4154eaf0032c8c2fda2
|
|
third-party/libtinyfiledialogs:
|
|
git: https://github.com/native-toolkit/libtinyfiledialogs/commit/cc6b593c029110af8045826ce691f540c85e850c
|
|
alternatives:
|
|
- https://github.com/btzy/nativefiledialog-extended (only file dialog support though!)
|
|
third-party/sse2neon:
|
|
git: https://github.com/DLTcollab/sse2neon/releases/tag/v1.9.1
|
|
license: MIT
|
|
third-party/curl:
|
|
git: https://github.com/curl/curl/tree/curl-8_21_0
|
|
license: MIT-like
|
|
third-party/draco:
|
|
git: https://github.com/google/draco
|
|
license: Apache License 2.0
|
|
modifications:
|
|
- https://github.com/google/draco/pull/987
|
|
- "PR #3723 (https://github.com/open-goal/jak-project/pull/3723)"
|
|
third-party/json.hpp
|
|
git: https://github.com/nlohmann/json/blob/eba0a92bfb1abf242f30e894b96ba11c9f4048c7/single_include/nlohmann/json.hpp
|