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)
257 lines
6.4 KiB
C
Vendored
Generated
257 lines
6.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 "first.h"
|
|
|
|
#include "testtrace.h"
|
|
|
|
#ifndef CURL_DISABLE_WEBSOCKETS
|
|
|
|
static const char *descr_flags(int flags)
|
|
{
|
|
if(flags & CURLWS_TEXT)
|
|
return flags & CURLWS_CONT ? "txt ---" : "txt fin";
|
|
if(flags & CURLWS_BINARY)
|
|
return flags & CURLWS_CONT ? "bin ---" : "bin fin";
|
|
if(flags & CURLWS_PING)
|
|
return "ping";
|
|
if(flags & CURLWS_PONG)
|
|
return "pong";
|
|
if(flags & CURLWS_CLOSE)
|
|
return "close";
|
|
assert(FALSE);
|
|
return "";
|
|
}
|
|
|
|
static CURLcode send_header(CURL *curl, int flags, size_t size)
|
|
{
|
|
CURLcode result = CURLE_OK;
|
|
size_t nsent;
|
|
|
|
retry:
|
|
result = curl_ws_send(curl, NULL, 0, &nsent, (curl_off_t)size,
|
|
flags | CURLWS_OFFSET);
|
|
if(result == CURLE_AGAIN) {
|
|
assert(nsent == 0);
|
|
goto retry;
|
|
}
|
|
if(result) {
|
|
curl_mfprintf(stderr, "%s:%d curl_ws_send() failed with code %d (%s)\n",
|
|
__FILE__, __LINE__, (int)result, curl_easy_strerror(result));
|
|
assert(nsent == 0);
|
|
return result;
|
|
}
|
|
|
|
assert(nsent == 0);
|
|
|
|
return CURLE_OK;
|
|
}
|
|
|
|
static CURLcode recv_header(CURL *curl, int *flags, curl_off_t *offset,
|
|
curl_off_t *bytesleft)
|
|
{
|
|
CURLcode result = CURLE_OK;
|
|
size_t nread;
|
|
const struct curl_ws_frame *meta;
|
|
|
|
*flags = 0;
|
|
*offset = 0;
|
|
*bytesleft = 0;
|
|
|
|
retry:
|
|
result = curl_ws_recv(curl, NULL, 0, &nread, &meta);
|
|
if(result == CURLE_AGAIN) {
|
|
assert(nread == 0);
|
|
goto retry;
|
|
}
|
|
if(result) {
|
|
curl_mfprintf(stderr, "%s:%d curl_ws_recv() failed with code %d (%s)\n",
|
|
__FILE__, __LINE__, (int)result, curl_easy_strerror(result));
|
|
assert(nread == 0);
|
|
return result;
|
|
}
|
|
|
|
assert(nread == 0);
|
|
assert(meta);
|
|
assert(meta->flags);
|
|
assert(meta->offset == 0);
|
|
|
|
*flags = meta->flags;
|
|
*offset = meta->offset;
|
|
*bytesleft = meta->bytesleft;
|
|
|
|
curl_mfprintf(stdout, "%s [%" FMT_OFF_T "]", descr_flags(meta->flags),
|
|
meta->bytesleft);
|
|
|
|
if(meta->bytesleft > 0)
|
|
curl_mfprintf(stdout, " ");
|
|
|
|
result = send_header(curl, meta->flags, (size_t)meta->bytesleft);
|
|
if(result)
|
|
return result;
|
|
|
|
return CURLE_OK;
|
|
}
|
|
|
|
static CURLcode send_chunk(CURL *curl, int flags, const char *buffer,
|
|
size_t size, size_t *offset)
|
|
{
|
|
CURLcode result = CURLE_OK;
|
|
size_t nsent;
|
|
|
|
retry:
|
|
result = curl_ws_send(curl, buffer + *offset, size - *offset, &nsent,
|
|
0, flags);
|
|
if(result == CURLE_AGAIN) {
|
|
assert(nsent == 0);
|
|
goto retry;
|
|
}
|
|
if(result) {
|
|
curl_mfprintf(stderr, "%s:%d curl_ws_send() failed with code %d (%s)\n",
|
|
__FILE__, __LINE__, (int)result, curl_easy_strerror(result));
|
|
assert(nsent == 0);
|
|
return result;
|
|
}
|
|
|
|
assert(nsent <= size - *offset);
|
|
|
|
*offset += nsent;
|
|
|
|
return CURLE_OK;
|
|
}
|
|
|
|
static CURLcode recv_chunk(CURL *curl, int flags, curl_off_t *offset,
|
|
curl_off_t *bytesleft)
|
|
{
|
|
CURLcode result = CURLE_OK;
|
|
char buffer[256];
|
|
size_t nread;
|
|
const struct curl_ws_frame *meta;
|
|
size_t sendoffset = 0;
|
|
|
|
retry:
|
|
result = curl_ws_recv(curl, buffer, sizeof(buffer), &nread, &meta);
|
|
if(result == CURLE_AGAIN) {
|
|
assert(nread == 0);
|
|
goto retry;
|
|
}
|
|
if(result) {
|
|
curl_mfprintf(stderr, "%s:%d curl_ws_recv() failed with code %d (%s)\n",
|
|
__FILE__, __LINE__, (int)result, curl_easy_strerror(result));
|
|
assert(nread == 0);
|
|
return result;
|
|
}
|
|
|
|
assert(nread <= sizeof(buffer));
|
|
assert(meta);
|
|
assert(meta->flags == flags);
|
|
assert(meta->offset == *offset);
|
|
assert(meta->bytesleft == (*bytesleft - (curl_off_t)nread));
|
|
|
|
*offset += nread;
|
|
*bytesleft -= nread;
|
|
|
|
fwrite(buffer, 1, nread, stdout);
|
|
|
|
while(sendoffset < nread) {
|
|
result = send_chunk(curl, flags, buffer, nread, &sendoffset);
|
|
if(result)
|
|
return result;
|
|
}
|
|
|
|
return CURLE_OK;
|
|
}
|
|
|
|
static CURLcode recv_frame(CURL *curl, bool *stop)
|
|
{
|
|
CURLcode result = CURLE_OK;
|
|
int flags = 0;
|
|
curl_off_t offset = 0;
|
|
curl_off_t bytesleft = 0;
|
|
|
|
result = recv_header(curl, &flags, &offset, &bytesleft);
|
|
if(result)
|
|
return result;
|
|
|
|
while(bytesleft > 0) {
|
|
result = recv_chunk(curl, flags, &offset, &bytesleft);
|
|
if(result)
|
|
return result;
|
|
}
|
|
|
|
if(flags & CURLWS_CLOSE)
|
|
*stop = TRUE;
|
|
|
|
curl_mfprintf(stdout, "\n");
|
|
|
|
return result;
|
|
}
|
|
#endif
|
|
|
|
static CURLcode test_lib2700(const char *URL)
|
|
{
|
|
#ifndef CURL_DISABLE_WEBSOCKETS
|
|
CURLcode result = CURLE_OK;
|
|
bool stop = FALSE;
|
|
CURL *curl;
|
|
|
|
global_init(CURL_GLOBAL_ALL);
|
|
curl_global_trace("ws");
|
|
easy_init(curl);
|
|
|
|
easy_setopt(curl, CURLOPT_URL, URL);
|
|
easy_setopt(curl, CURLOPT_USERAGENT, "client/test2700");
|
|
debug_config.nohex = TRUE;
|
|
debug_config.tracetime = TRUE;
|
|
easy_setopt(curl, CURLOPT_DEBUGDATA, &debug_config);
|
|
easy_setopt(curl, CURLOPT_DEBUGFUNCTION, libtest_debug_cb);
|
|
easy_setopt(curl, CURLOPT_VERBOSE, 1L);
|
|
easy_setopt(curl, CURLOPT_CONNECT_ONLY, 2L);
|
|
if(testnum != 2708)
|
|
easy_setopt(curl, CURLOPT_WS_OPTIONS, CURLWS_NOAUTOPONG);
|
|
|
|
result = curl_easy_perform(curl);
|
|
if(result) {
|
|
curl_mfprintf(stderr,
|
|
"%s:%d curl_easy_perform() failed with code %d (%s)\n",
|
|
__FILE__, __LINE__, (int)result, curl_easy_strerror(result));
|
|
goto test_cleanup;
|
|
}
|
|
|
|
while(!stop) {
|
|
result = recv_frame(curl, &stop);
|
|
if(result)
|
|
goto test_cleanup;
|
|
}
|
|
|
|
test_cleanup:
|
|
curl_easy_cleanup(curl);
|
|
curl_global_cleanup();
|
|
return result;
|
|
#else
|
|
(void)URL;
|
|
curl_mfprintf(stderr, "Missing support\n");
|
|
return CURLE_UNSUPPORTED_PROTOCOL;
|
|
#endif
|
|
}
|