mirror of
https://github.com/open-goal/jak-project
synced 2026-09-12 04:49:19 -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)
135 lines
5.2 KiB
C
Vendored
Generated
135 lines
5.2 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-table.h"
|
|
#include "curl_trc.h"
|
|
|
|
#define TBL_SIZE 100
|
|
|
|
static CURLcode t3212_setup(struct uint32_tbl *tbl)
|
|
{
|
|
Curl_uint32_tbl_init(tbl, NULL);
|
|
return Curl_uint32_tbl_resize(tbl, TBL_SIZE);
|
|
}
|
|
|
|
static void t3212_stop(struct uint32_tbl *tbl)
|
|
{
|
|
Curl_uint32_tbl_destroy(tbl);
|
|
}
|
|
|
|
static CURLcode test_unit3212(const char *arg)
|
|
{
|
|
struct uint32_tbl tbl;
|
|
int dummy;
|
|
|
|
UNITTEST_BEGIN(t3212_setup(&tbl))
|
|
|
|
uint32_t i, key, n;
|
|
void *entry;
|
|
|
|
fail_unless(Curl_uint32_tbl_capacity(&tbl) == TBL_SIZE, "wrong capacity");
|
|
|
|
for(i = 0; i < TBL_SIZE; ++i) {
|
|
fail_unless(Curl_uint32_tbl_add(&tbl, &dummy, &key), "failed to add");
|
|
fail_unless(key == i, "unexpected key assigned");
|
|
}
|
|
/* table should be full now */
|
|
fail_unless(Curl_uint32_tbl_count(&tbl) == TBL_SIZE, "wrong count");
|
|
fail_unless(!Curl_uint32_tbl_add(&tbl, &dummy, &key), "could add more");
|
|
/* remove every 2nd entry, from full table */
|
|
n = TBL_SIZE;
|
|
for(i = 0; i < TBL_SIZE; i += 2) {
|
|
Curl_uint32_tbl_remove(&tbl, i);
|
|
--n;
|
|
fail_unless(Curl_uint32_tbl_count(&tbl) == n, "wrong count after remove");
|
|
}
|
|
/* remove same again, should not change count */
|
|
for(i = 0; i < TBL_SIZE; i += 2) {
|
|
Curl_uint32_tbl_remove(&tbl, i);
|
|
fail_unless(Curl_uint32_tbl_count(&tbl) == n, "wrong count after remove");
|
|
}
|
|
/* still contains all odd entries */
|
|
for(i = 1; i < TBL_SIZE; i += 2) {
|
|
fail_unless(Curl_uint32_tbl_contains(&tbl, i), "does not contain");
|
|
fail_unless(Curl_uint32_tbl_get(&tbl, i) == &dummy,
|
|
"does not contain dummy");
|
|
}
|
|
/* get the first key */
|
|
fail_unless(Curl_uint32_tbl_first(&tbl, &key, &entry), "first failed");
|
|
fail_unless(key == 1, "unexpected first key");
|
|
fail_unless(entry == &dummy, "unexpected first entry");
|
|
/* get the second key */
|
|
fail_unless(Curl_uint32_tbl_next(&tbl, 1, &key, &entry), "next1 failed");
|
|
fail_unless(key == 3, "unexpected second key");
|
|
fail_unless(entry == &dummy, "unexpected second entry");
|
|
/* get the key after 42 */
|
|
fail_unless(Curl_uint32_tbl_next(&tbl, 42, &key, &entry), "next42 failed");
|
|
fail_unless(key == 43, "unexpected next42 key");
|
|
fail_unless(entry == &dummy, "unexpected next42 entry");
|
|
|
|
/* double capacity */
|
|
n = Curl_uint32_tbl_count(&tbl);
|
|
fail_unless(!Curl_uint32_tbl_resize(&tbl, TBL_SIZE * 2),
|
|
"error doubling size");
|
|
fail_unless(Curl_uint32_tbl_count(&tbl) == n, "wrong resize count");
|
|
/* resize to half of original */
|
|
fail_unless(!Curl_uint32_tbl_resize(&tbl, TBL_SIZE / 2),
|
|
"error halving size");
|
|
fail_unless(Curl_uint32_tbl_count(&tbl) == n / 2, "wrong half size count");
|
|
for(i = 1; i < TBL_SIZE / 2; i += 2) {
|
|
fail_unless(Curl_uint32_tbl_contains(&tbl, i), "does not contain");
|
|
fail_unless(Curl_uint32_tbl_get(&tbl, i) == &dummy,
|
|
"does not contain dummy");
|
|
}
|
|
/* clear */
|
|
uint32_tbl_clear(&tbl);
|
|
fail_unless(!Curl_uint32_tbl_count(&tbl), "count not 0 after clear");
|
|
for(i = 0; i < TBL_SIZE / 2; ++i) {
|
|
fail_unless(!Curl_uint32_tbl_contains(&tbl, i),
|
|
"does contain, should not");
|
|
}
|
|
/* add after clear gets key 0 again */
|
|
fail_unless(Curl_uint32_tbl_add(&tbl, &dummy, &key), "failed to add");
|
|
fail_unless(key == 0, "unexpected key assigned");
|
|
/* remove it again and add, should get key 1 */
|
|
Curl_uint32_tbl_remove(&tbl, key);
|
|
fail_unless(Curl_uint32_tbl_add(&tbl, &dummy, &key), "failed to add");
|
|
fail_unless(key == 1, "unexpected key assigned");
|
|
/* clear, fill, remove one, add, should get the removed key again */
|
|
uint32_tbl_clear(&tbl);
|
|
for(i = 0; i < Curl_uint32_tbl_capacity(&tbl); ++i)
|
|
fail_unless(Curl_uint32_tbl_add(&tbl, &dummy, &key), "failed to add");
|
|
fail_unless(!Curl_uint32_tbl_add(&tbl, &dummy, &key), "add on full");
|
|
Curl_uint32_tbl_remove(&tbl, 17);
|
|
fail_unless(Curl_uint32_tbl_add(&tbl, &dummy, &key), "failed to add again");
|
|
fail_unless(key == 17, "unexpected key assigned");
|
|
/* and again, triggering key search wrap around */
|
|
Curl_uint32_tbl_remove(&tbl, 17);
|
|
fail_unless(Curl_uint32_tbl_add(&tbl, &dummy, &key), "failed to add again");
|
|
fail_unless(key == 17, "unexpected key assigned");
|
|
|
|
UNITTEST_END(t3212_stop(&tbl))
|
|
}
|