mirror of
https://github.com/open-goal/jak-project
synced 2026-08-31 17:43:06 -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)
92 lines
3.5 KiB
C
Vendored
Generated
92 lines
3.5 KiB
C
Vendored
Generated
#ifndef HEADER_CURL_UINT_SPBSET_H
|
|
#define HEADER_CURL_UINT_SPBSET_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* 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"
|
|
|
|
/* A "sparse" bitset for uint32_t values.
|
|
* It can hold any uint32_t value.
|
|
*
|
|
* Optimized for the case where only a small set of numbers need
|
|
* to be kept, especially when "close" together. Then storage space
|
|
* is most efficient, deteriorating when many number are far apart.
|
|
*/
|
|
|
|
/* 4 slots = 256 bits, keep this a 2^n value. */
|
|
#define CURL_UINT32_SPBSET_CH_SLOTS 4
|
|
#define CURL_UINT32_SPBSET_CH_MASK ((CURL_UINT32_SPBSET_CH_SLOTS * 64) - 1)
|
|
|
|
/* store the uint value from offset to
|
|
* (offset + (CURL_UINT32_SPBSET_CHUNK_SLOTS * 64) - 1 */
|
|
struct uint32_spbset_chunk {
|
|
struct uint32_spbset_chunk *next;
|
|
uint64_t slots[CURL_UINT32_SPBSET_CH_SLOTS];
|
|
uint32_t offset;
|
|
};
|
|
|
|
struct uint32_spbset {
|
|
struct uint32_spbset_chunk head;
|
|
#ifdef DEBUGBUILD
|
|
int init;
|
|
#endif
|
|
};
|
|
|
|
void Curl_uint32_spbset_init(struct uint32_spbset *bset);
|
|
|
|
void Curl_uint32_spbset_destroy(struct uint32_spbset *bset);
|
|
|
|
/* Get the cardinality of the bitset, e.g. numbers present in the set. */
|
|
uint32_t Curl_uint32_spbset_count(struct uint32_spbset *bset);
|
|
|
|
/* Add the number `i` to the bitset.
|
|
* Numbers can be added more than once, without making a difference.
|
|
* Returns FALSE if allocations failed. */
|
|
bool Curl_uint32_spbset_add(struct uint32_spbset *bset, uint32_t i);
|
|
|
|
/* Remove the number `i` from the bitset. */
|
|
void Curl_uint32_spbset_remove(struct uint32_spbset *bset, uint32_t i);
|
|
|
|
/* Return TRUE if the bitset contains number `i`. */
|
|
bool Curl_uint32_spbset_contains(struct uint32_spbset *bset, uint32_t i);
|
|
|
|
/* Get the first number in the bitset, e.g. the smallest.
|
|
* Returns FALSE when the bitset is empty. */
|
|
bool Curl_uint32_spbset_first(struct uint32_spbset *bset, uint32_t *pfirst);
|
|
|
|
/* Get the next number in the bitset, following `last` in natural order.
|
|
* Put another way, this is the smallest number greater than `last` in
|
|
* the bitset. `last` does not have to be present in the set.
|
|
*
|
|
* Returns FALSE when no such number is in the set.
|
|
*
|
|
* This allows to iterate the set while being modified:
|
|
* - added numbers higher than 'last' will be picked up by the iteration.
|
|
* - added numbers lower than 'last' will not show up.
|
|
* - removed numbers lower or equal to 'last' will not show up.
|
|
* - removed numbers higher than 'last' will not be visited. */
|
|
bool Curl_uint32_spbset_next(struct uint32_spbset *bset, uint32_t last,
|
|
uint32_t *pnext);
|
|
|
|
#endif /* HEADER_CURL_UINT_SPBSET_H */
|