mirror of
https://github.com/open-goal/jak-project
synced 2026-08-28 08:49:16 -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)
84 lines
3.3 KiB
C
Vendored
Generated
84 lines
3.3 KiB
C
Vendored
Generated
#ifndef HEADER_CURL_DYNBUF_H
|
|
#define HEADER_CURL_DYNBUF_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
|
|
*
|
|
***************************************************************************/
|
|
|
|
struct dynbuf {
|
|
char *bufr; /* point to a null-terminated allocated buffer */
|
|
size_t leng; /* number of bytes *EXCLUDING* the null-terminator */
|
|
size_t allc; /* size of the current allocation */
|
|
size_t toobig; /* size limit for the buffer */
|
|
#ifdef DEBUGBUILD
|
|
int init; /* detect API usage mistakes */
|
|
#endif
|
|
};
|
|
|
|
void curlx_dyn_init(struct dynbuf *s, size_t toobig);
|
|
void curlx_dyn_free(struct dynbuf *s);
|
|
CURLcode curlx_dyn_addn(struct dynbuf *s, const void *mem, size_t len)
|
|
WARN_UNUSED_RESULT;
|
|
CURLcode curlx_dyn_add(struct dynbuf *s, const char *str)
|
|
WARN_UNUSED_RESULT;
|
|
CURLcode curlx_dyn_addf(struct dynbuf *s, const char *fmt, ...)
|
|
WARN_UNUSED_RESULT CURL_PRINTF(2, 3);
|
|
CURLcode curlx_dyn_vaddf(struct dynbuf *s, const char *fmt, va_list ap)
|
|
WARN_UNUSED_RESULT CURL_PRINTF(2, 0);
|
|
void curlx_dyn_reset(struct dynbuf *s);
|
|
CURLcode curlx_dyn_tail(struct dynbuf *s, size_t trail);
|
|
CURLcode curlx_dyn_setlen(struct dynbuf *s, size_t set);
|
|
char *curlx_dyn_ptr(const struct dynbuf *s);
|
|
unsigned char *curlx_dyn_uptr(const struct dynbuf *s);
|
|
size_t curlx_dyn_len(const struct dynbuf *s);
|
|
|
|
/* returns 0 on success, -1 on error */
|
|
/* The implementation of this function exists in mprintf.c */
|
|
int curlx_dyn_vprintf(struct dynbuf *dyn, const char *format, va_list args);
|
|
|
|
/* Take the buffer out of the dynbuf. Caller has ownership and
|
|
* dynbuf resets to initial state. */
|
|
char *curlx_dyn_take(struct dynbuf *s, size_t *plen);
|
|
|
|
/* Dynamic buffer max sizes */
|
|
#define MAX_DYNBUF_SIZE (SIZE_MAX / 2)
|
|
|
|
#define DYN_DOH_RESPONSE 3000
|
|
#define DYN_DOH_CNAME 256
|
|
#define DYN_PAUSE_BUFFER (64 * 1024 * 1024)
|
|
#define DYN_HAXPROXY 2048
|
|
#define DYN_HTTP_REQUEST (1024 * 1024)
|
|
#define DYN_APRINTF 8000000
|
|
#define DYN_RTSP_REQ_HEADER (64 * 1024)
|
|
#define DYN_TRAILERS (64 * 1024)
|
|
#define DYN_PROXY_CONNECT_HEADERS 16384
|
|
#define DYN_QLOG_NAME 1024
|
|
#define DYN_H1_TRAILER 4096
|
|
#define DYN_PINGPPONG_CMD (64 * 1024)
|
|
#define DYN_IMAP_CMD (64 * 1024)
|
|
#define DYN_MQTT_RECV (64 * 1024)
|
|
#define DYN_MQTT_SEND 0xFFFFFFF
|
|
#define DYN_CRLFILE_SIZE (400 * 1024 * 1024) /* 400MiB */
|
|
#define DYN_CERTFILE_SIZE (100 * 1024) /* 100KiB */
|
|
#define DYN_KEYFILE_SIZE (100 * 1024) /* 100KiB */
|
|
#endif
|