mirror of
https://github.com/open-goal/jak-project
synced 2026-08-27 16:37:36 -04:00
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)
150 lines
5.3 KiB
C
Vendored
Generated
150 lines
5.3 KiB
C
Vendored
Generated
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
#include "unitcheck.h"
|
|
#include "urldata.h"
|
|
#include "uint-bset.h"
|
|
#include "curl_trc.h"
|
|
|
|
static void check_set(const char *name, uint32_t capacity,
|
|
const uint32_t *s, size_t slen)
|
|
{
|
|
struct uint32_bset bset;
|
|
size_t i, j;
|
|
uint32_t n, c;
|
|
|
|
curl_mfprintf(stderr, "test %s, capacity=%u, %zu numbers\n",
|
|
name, capacity, slen);
|
|
Curl_uint32_bset_init(&bset);
|
|
fail_unless(!Curl_uint32_bset_resize(&bset, capacity), "bset resize failed");
|
|
c = uint32_bset_capacity(&bset);
|
|
fail_unless(c == (((capacity + 63) / 64) * 64), "wrong capacity");
|
|
|
|
Curl_uint32_bset_clear(&bset);
|
|
c = Curl_uint32_bset_count(&bset);
|
|
fail_unless(c == 0, "set count is not 0");
|
|
|
|
for(i = 0; i < slen; ++i) { /* add all */
|
|
fail_unless(Curl_uint32_bset_add(&bset, s[i]), "failed to add");
|
|
for(j = i + 1; j < slen; ++j)
|
|
fail_unless(!Curl_uint32_bset_contains(&bset, s[j]),
|
|
"unexpectedly found");
|
|
}
|
|
|
|
for(i = 0; i < slen; ++i) { /* all present */
|
|
fail_unless(Curl_uint32_bset_contains(&bset, s[i]),
|
|
"failed presence check");
|
|
}
|
|
|
|
/* iterator over all numbers */
|
|
fail_unless(Curl_uint32_bset_first(&bset, &n), "first failed");
|
|
fail_unless(n == s[0], "first not correct number");
|
|
for(i = 1; i < slen; ++i) {
|
|
fail_unless(Curl_uint32_bset_next(&bset, n, &n), "next failed");
|
|
if(n != s[i]) {
|
|
curl_mfprintf(stderr, "expected next to be %u, not %u\n", s[i], n);
|
|
fail_unless(n == s[i], "next not correct number");
|
|
}
|
|
}
|
|
|
|
/* Adding capacity number does not work (0 - capacity-1) */
|
|
c = uint32_bset_capacity(&bset);
|
|
fail_unless(!Curl_uint32_bset_add(&bset, c), "add out of range worked");
|
|
/* The count it correct */
|
|
c = Curl_uint32_bset_count(&bset);
|
|
fail_unless(c == slen, "set count is wrong");
|
|
|
|
for(i = 0; i < slen; i += 2) { /* remove every 2nd */
|
|
Curl_uint32_bset_remove(&bset, s[i]);
|
|
fail_unless(!Curl_uint32_bset_contains(&bset, s[i]), "unexpectedly found");
|
|
}
|
|
for(i = 1; i < slen; i += 2) { /* others still there */
|
|
fail_unless(Curl_uint32_bset_contains(&bset, s[i]), "unexpectedly gone");
|
|
}
|
|
/* The count is half */
|
|
c = Curl_uint32_bset_count(&bset);
|
|
fail_unless(c == slen / 2, "set count is wrong");
|
|
|
|
Curl_uint32_bset_clear(&bset);
|
|
c = Curl_uint32_bset_count(&bset);
|
|
fail_unless(c == 0, "set count is not 0");
|
|
for(i = 0; i < slen; i++) { /* none present any longer */
|
|
fail_unless(!Curl_uint32_bset_contains(&bset, s[i]), "unexpectedly there");
|
|
}
|
|
|
|
for(i = 0; i < slen; ++i) { /* add all again */
|
|
fail_unless(Curl_uint32_bset_add(&bset, s[i]), "failed to add");
|
|
}
|
|
|
|
fail_unless(!Curl_uint32_bset_resize(&bset, capacity * 2),
|
|
"resize double failed");
|
|
for(i = 0; i < slen; i++) { /* all still present after resize */
|
|
fail_unless(Curl_uint32_bset_contains(&bset, s[i]), "unexpectedly lost");
|
|
}
|
|
|
|
fail_unless(!Curl_uint32_bset_resize(&bset, capacity), "resize back failed");
|
|
for(i = 0; i < slen; i++) /* all still present after resize back */
|
|
fail_unless(Curl_uint32_bset_contains(&bset, s[i]), "unexpectedly lost");
|
|
|
|
fail_unless(!Curl_uint32_bset_resize(&bset, capacity / 2),
|
|
"resize half failed");
|
|
/* halved the size, what numbers remain in set? */
|
|
c = uint32_bset_capacity(&bset);
|
|
n = 0;
|
|
for(i = 0; i < slen; ++i) {
|
|
if(s[i] < c)
|
|
++n;
|
|
}
|
|
fail_unless(n == Curl_uint32_bset_count(&bset), "set count(halved) wrong");
|
|
for(i = 0; i < n; i++) /* still present after resize half */
|
|
fail_unless(Curl_uint32_bset_contains(&bset, s[i]), "unexpectedly lost");
|
|
|
|
Curl_uint32_bset_destroy(&bset);
|
|
}
|
|
|
|
static CURLcode test_unit3211(const char *arg)
|
|
{
|
|
UNITTEST_BEGIN_SIMPLE
|
|
|
|
static const uint32_t s1[] = {
|
|
/* spread numbers, some at slot edges */
|
|
0, 1, 4, 17, 63, 64, 65, 66, 90, 99,
|
|
};
|
|
static const uint32_t s2[] = {
|
|
/* set with all bits in slot1 set */
|
|
64, 65, 66, 67, 68, 69, 70, 71,
|
|
72, 73, 74, 75, 76, 77, 78, 79,
|
|
80, 81, 82, 83, 84, 85, 86, 87,
|
|
88, 89, 90, 91, 92, 93, 94, 95,
|
|
96, 97, 98, 99, 100, 101, 102, 103,
|
|
104, 105, 106, 107, 108, 109, 110, 111,
|
|
112, 113, 114, 115, 116, 117, 118, 119,
|
|
120, 121, 122, 123, 124, 125, 126, 127,
|
|
};
|
|
|
|
check_set("s1", 100, s1, CURL_ARRAYSIZE(s1));
|
|
check_set("s2", 1000, s2, CURL_ARRAYSIZE(s2));
|
|
|
|
UNITTEST_END_SIMPLE
|
|
}
|