mirror of
https://github.com/open-goal/jak-project
synced 2026-08-06 18:03:30 -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)
203 lines
5.4 KiB
C
Vendored
Generated
203 lines
5.4 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 "curl_setup.h"
|
|
|
|
#include "uint-table.h"
|
|
|
|
#ifdef DEBUGBUILD
|
|
#define CURL_UINT32_TBL_MAGIC 0x62757473
|
|
#endif
|
|
|
|
void Curl_uint32_tbl_init(struct uint32_tbl *tbl,
|
|
Curl_uint32_tbl_entry_dtor *entry_dtor)
|
|
{
|
|
memset(tbl, 0, sizeof(*tbl));
|
|
tbl->entry_dtor = entry_dtor;
|
|
tbl->last_key_added = UINT32_MAX;
|
|
#ifdef DEBUGBUILD
|
|
tbl->init = CURL_UINT32_TBL_MAGIC;
|
|
#endif
|
|
}
|
|
|
|
static void uint32_tbl_clear_rows(struct uint32_tbl *tbl,
|
|
uint32_t from,
|
|
uint32_t upto_excluding)
|
|
{
|
|
uint32_t i, end;
|
|
|
|
end = CURLMIN(upto_excluding, tbl->nrows);
|
|
for(i = from; i < end; ++i) {
|
|
if(tbl->rows[i]) {
|
|
if(tbl->entry_dtor)
|
|
tbl->entry_dtor(i, tbl->rows[i]);
|
|
tbl->rows[i] = NULL;
|
|
tbl->nentries--;
|
|
}
|
|
}
|
|
}
|
|
|
|
CURLcode Curl_uint32_tbl_resize(struct uint32_tbl *tbl, uint32_t nrows)
|
|
{
|
|
/* we use `tbl->nrows + 1` during iteration, want that to work */
|
|
DEBUGASSERT(tbl->init == CURL_UINT32_TBL_MAGIC);
|
|
if(!nrows)
|
|
return CURLE_BAD_FUNCTION_ARGUMENT;
|
|
if(nrows != tbl->nrows) {
|
|
void **rows = curlx_calloc(nrows, sizeof(void *));
|
|
if(!rows)
|
|
return CURLE_OUT_OF_MEMORY;
|
|
if(tbl->rows) {
|
|
memcpy(rows, tbl->rows, (CURLMIN(nrows, tbl->nrows) * sizeof(void *)));
|
|
if(nrows < tbl->nrows)
|
|
uint32_tbl_clear_rows(tbl, nrows, tbl->nrows);
|
|
curlx_free(tbl->rows);
|
|
}
|
|
tbl->rows = rows;
|
|
tbl->nrows = nrows;
|
|
}
|
|
return CURLE_OK;
|
|
}
|
|
|
|
/* Clear the table, making it empty.
|
|
|
|
@unittest 3212
|
|
*/
|
|
UNITTEST void uint32_tbl_clear(struct uint32_tbl *tbl);
|
|
UNITTEST void uint32_tbl_clear(struct uint32_tbl *tbl)
|
|
{
|
|
DEBUGASSERT(tbl->init == CURL_UINT32_TBL_MAGIC);
|
|
uint32_tbl_clear_rows(tbl, 0, tbl->nrows);
|
|
DEBUGASSERT(!tbl->nentries);
|
|
tbl->last_key_added = UINT32_MAX;
|
|
}
|
|
|
|
void Curl_uint32_tbl_destroy(struct uint32_tbl *tbl)
|
|
{
|
|
DEBUGASSERT(tbl->init == CURL_UINT32_TBL_MAGIC);
|
|
uint32_tbl_clear(tbl);
|
|
curlx_free(tbl->rows);
|
|
memset(tbl, 0, sizeof(*tbl));
|
|
}
|
|
|
|
uint32_t Curl_uint32_tbl_capacity(struct uint32_tbl *tbl)
|
|
{
|
|
return tbl->nrows;
|
|
}
|
|
|
|
uint32_t Curl_uint32_tbl_count(struct uint32_tbl *tbl)
|
|
{
|
|
return tbl->nentries;
|
|
}
|
|
|
|
void *Curl_uint32_tbl_get(struct uint32_tbl *tbl, uint32_t key)
|
|
{
|
|
return (key < tbl->nrows) ? tbl->rows[key] : NULL;
|
|
}
|
|
|
|
bool Curl_uint32_tbl_add(struct uint32_tbl *tbl, void *entry, uint32_t *pkey)
|
|
{
|
|
uint32_t key, start_pos;
|
|
|
|
DEBUGASSERT(tbl->init == CURL_UINT32_TBL_MAGIC);
|
|
if(!entry || !pkey)
|
|
return FALSE;
|
|
*pkey = UINT32_MAX;
|
|
if(tbl->nentries == tbl->nrows) /* full */
|
|
return FALSE;
|
|
|
|
start_pos = CURLMIN(tbl->last_key_added, tbl->nrows) + 1;
|
|
for(key = start_pos; key < tbl->nrows; ++key) {
|
|
if(!tbl->rows[key]) {
|
|
tbl->rows[key] = entry;
|
|
tbl->nentries++;
|
|
tbl->last_key_added = key;
|
|
*pkey = key;
|
|
return TRUE;
|
|
}
|
|
}
|
|
/* no free entry at or above tbl->maybe_next_key, wrap around */
|
|
for(key = 0; key < start_pos; ++key) {
|
|
if(!tbl->rows[key]) {
|
|
tbl->rows[key] = entry;
|
|
tbl->nentries++;
|
|
tbl->last_key_added = key;
|
|
*pkey = key;
|
|
return TRUE;
|
|
}
|
|
}
|
|
/* Did not find any free row? Should not happen */
|
|
DEBUGASSERT(0);
|
|
return FALSE;
|
|
}
|
|
|
|
void Curl_uint32_tbl_remove(struct uint32_tbl *tbl, uint32_t key)
|
|
{
|
|
uint32_tbl_clear_rows(tbl, key, key + 1);
|
|
}
|
|
|
|
bool Curl_uint32_tbl_contains(struct uint32_tbl *tbl, uint32_t key)
|
|
{
|
|
return (key < tbl->nrows) ? !!tbl->rows[key] : FALSE;
|
|
}
|
|
|
|
static bool uint32_tbl_next_at(struct uint32_tbl *tbl, uint32_t key,
|
|
uint32_t *pkey, void **pentry)
|
|
{
|
|
for(; key < tbl->nrows; ++key) {
|
|
if(tbl->rows[key]) {
|
|
*pkey = key;
|
|
*pentry = tbl->rows[key];
|
|
return TRUE;
|
|
}
|
|
}
|
|
*pkey = UINT32_MAX; /* always invalid */
|
|
*pentry = NULL;
|
|
return FALSE;
|
|
}
|
|
|
|
bool Curl_uint32_tbl_first(struct uint32_tbl *tbl,
|
|
uint32_t *pkey, void **pentry)
|
|
{
|
|
if(!pkey || !pentry)
|
|
return FALSE;
|
|
if(tbl->nentries && uint32_tbl_next_at(tbl, 0, pkey, pentry))
|
|
return TRUE;
|
|
DEBUGASSERT(!tbl->nentries);
|
|
*pkey = UINT32_MAX; /* always invalid */
|
|
*pentry = NULL;
|
|
return FALSE;
|
|
}
|
|
|
|
bool Curl_uint32_tbl_next(struct uint32_tbl *tbl, uint32_t last_key,
|
|
uint32_t *pkey, void **pentry)
|
|
{
|
|
if(!pkey || !pentry)
|
|
return FALSE;
|
|
if(uint32_tbl_next_at(tbl, last_key + 1, pkey, pentry))
|
|
return TRUE;
|
|
*pkey = UINT32_MAX; /* always invalid */
|
|
*pentry = NULL;
|
|
return FALSE;
|
|
}
|