mirror of
https://github.com/open-goal/jak-project
synced 2026-08-20 14:24:45 -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)
158 lines
4.2 KiB
C
Vendored
Generated
158 lines
4.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 "curl_setup.h"
|
|
|
|
#ifndef CURL_DISABLE_WEBSOCKETS
|
|
/* only used for this protocol, so far */
|
|
|
|
#include "urldata.h"
|
|
#include "bufq.h"
|
|
#include "cfilters.h"
|
|
#include "cf-recvbuf.h"
|
|
#include "curl_trc.h"
|
|
|
|
#define CURL_CF_RECVBUF_CHUNK (16 * 1024)
|
|
|
|
struct cf_recvbuf_ctx {
|
|
struct bufq recvbuf;
|
|
};
|
|
|
|
static void cf_recvbuf_destroy(struct Curl_cfilter *cf,
|
|
struct Curl_easy *data)
|
|
{
|
|
struct cf_recvbuf_ctx *ctx = cf->ctx;
|
|
(void)data;
|
|
if(ctx) {
|
|
Curl_bufq_free(&ctx->recvbuf);
|
|
curlx_free(ctx);
|
|
}
|
|
}
|
|
|
|
static CURLcode cf_recvbuf_recv(struct Curl_cfilter *cf,
|
|
struct Curl_easy *data,
|
|
char *buf, size_t len,
|
|
size_t *pnread)
|
|
{
|
|
struct cf_recvbuf_ctx *ctx = cf->ctx;
|
|
|
|
if(!Curl_bufq_is_empty(&ctx->recvbuf)) {
|
|
return Curl_bufq_cread(&ctx->recvbuf, buf, len, pnread);
|
|
}
|
|
|
|
if(cf->next)
|
|
return cf->next->cft->do_recv(cf->next, data, buf, len, pnread);
|
|
*pnread = 0;
|
|
return CURLE_RECV_ERROR;
|
|
}
|
|
|
|
static bool cf_recvbuf_data_pending(struct Curl_cfilter *cf,
|
|
const struct Curl_easy *data)
|
|
{
|
|
struct cf_recvbuf_ctx *ctx = cf->ctx;
|
|
|
|
if(!Curl_bufq_is_empty(&ctx->recvbuf))
|
|
return TRUE;
|
|
|
|
return cf->next ?
|
|
cf->next->cft->has_data_pending(cf->next, data) : FALSE;
|
|
}
|
|
|
|
struct Curl_cftype Curl_cft_recvbuf = {
|
|
"RECVBUF",
|
|
0,
|
|
CURL_LOG_LVL_NONE,
|
|
cf_recvbuf_destroy,
|
|
Curl_cf_def_connect,
|
|
Curl_cf_def_shutdown,
|
|
Curl_cf_def_adjust_pollset,
|
|
cf_recvbuf_data_pending,
|
|
Curl_cf_def_send,
|
|
cf_recvbuf_recv,
|
|
Curl_cf_def_cntrl,
|
|
Curl_cf_def_conn_is_alive,
|
|
Curl_cf_def_conn_keep_alive,
|
|
Curl_cf_def_query,
|
|
};
|
|
|
|
static CURLcode cf_recvbuf_create(struct Curl_cfilter **pcf,
|
|
struct Curl_easy *data,
|
|
const uint8_t *buf, size_t blen)
|
|
{
|
|
struct Curl_cfilter *cf = NULL;
|
|
struct cf_recvbuf_ctx *ctx;
|
|
CURLcode result = CURLE_OK;
|
|
size_t nwritten = 0;
|
|
|
|
(void)data;
|
|
ctx = curlx_calloc(1, sizeof(*ctx));
|
|
if(!ctx) {
|
|
result = CURLE_OUT_OF_MEMORY;
|
|
goto out;
|
|
}
|
|
Curl_bufq_init2(&ctx->recvbuf, CURL_CF_RECVBUF_CHUNK,
|
|
(blen / CURL_CF_RECVBUF_CHUNK) + 1,
|
|
(BUFQ_OPT_SOFT_LIMIT | BUFQ_OPT_NO_SPARES));
|
|
result = Curl_bufq_write(&ctx->recvbuf, buf, blen, &nwritten);
|
|
if(result)
|
|
goto out;
|
|
if(nwritten != blen) {
|
|
result = CURLE_FAILED_INIT;
|
|
goto out;
|
|
}
|
|
|
|
result = Curl_cf_create(&cf, &Curl_cft_recvbuf, ctx);
|
|
if(result)
|
|
goto out;
|
|
ctx = NULL;
|
|
|
|
out:
|
|
*pcf = result ? NULL : cf;
|
|
if(ctx) {
|
|
Curl_bufq_free(&ctx->recvbuf);
|
|
curlx_free(ctx);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
CURLcode Curl_cf_recvbuf_add(struct Curl_easy *data,
|
|
struct connectdata *conn,
|
|
int sockindex,
|
|
const uint8_t *buf, size_t blen)
|
|
{
|
|
struct Curl_cfilter *cf;
|
|
CURLcode result = CURLE_OK;
|
|
|
|
DEBUGASSERT(data);
|
|
result = cf_recvbuf_create(&cf, data, buf, blen);
|
|
if(result)
|
|
goto out;
|
|
|
|
cf->connected = Curl_conn_is_connected(conn, sockindex);
|
|
Curl_conn_cf_add(data, conn, sockindex, cf);
|
|
out:
|
|
return result;
|
|
}
|
|
|
|
#endif /* !CURL_DISABLE_WEBSOCKETS */
|