mirror of
https://github.com/open-goal/jak-project
synced 2026-08-09 02:49:19 -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)
303 lines
7.4 KiB
C
Vendored
Generated
303 lines
7.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"
|
|
|
|
#ifdef HAVE_LOCALE_H
|
|
#include <locale.h> /* for setlocale() */
|
|
#endif
|
|
|
|
#if defined(UNITTESTS) && !defined(BUILDING_LIBCURL)
|
|
#include "tool_stderr.h" /* for tool_init_stderr() */
|
|
#endif
|
|
|
|
int select_wrapper(int nfds, fd_set *rd, fd_set *wr, fd_set *exc,
|
|
struct timeval *tv)
|
|
{
|
|
if(nfds < 0) {
|
|
SET_SOCKERRNO(SOCKEINVAL);
|
|
return -1;
|
|
}
|
|
#ifdef USE_WINSOCK
|
|
/*
|
|
* Winsock select() requires that at least one of the three fd_set
|
|
* pointers is not NULL and points to a non-empty fdset. IOW Winsock
|
|
* select() can not be used to sleep without a single fd_set.
|
|
*/
|
|
if(!nfds) {
|
|
Sleep((DWORD)curlx_tvtoms(tv));
|
|
return 0;
|
|
}
|
|
#endif
|
|
return select(nfds, rd, wr, exc, tv);
|
|
}
|
|
|
|
const char *libtest_arg2 = NULL;
|
|
const char *libtest_arg3 = NULL;
|
|
const char *libtest_arg4 = NULL;
|
|
const char *libtest_arg5 = NULL;
|
|
int test_argc;
|
|
const char **test_argv;
|
|
int testnum;
|
|
|
|
struct curltime tv_test_start; /* for test timing */
|
|
|
|
int unitfail; /* for unittests */
|
|
|
|
int coptind;
|
|
const char *coptarg;
|
|
|
|
int cgetopt(int argc, const char * const argv[], const char *optstring)
|
|
{
|
|
static int optpos = 1;
|
|
int coptopt;
|
|
const char *arg;
|
|
|
|
if(coptind == 0) { /* Reset? */
|
|
coptind = !!argc;
|
|
optpos = 1;
|
|
}
|
|
|
|
arg = argv[coptind];
|
|
if(arg && !strcmp(arg, "--")) {
|
|
coptind++;
|
|
return -1;
|
|
}
|
|
else if(!arg || arg[0] != '-') {
|
|
return -1;
|
|
}
|
|
else {
|
|
const char *opt = strchr(optstring, arg[optpos]);
|
|
coptopt = (unsigned char)arg[optpos];
|
|
if(!opt) {
|
|
if(!arg[++optpos]) {
|
|
coptind++;
|
|
optpos = 1;
|
|
}
|
|
return '?';
|
|
}
|
|
else if(opt[1] == ':') {
|
|
if(arg[optpos + 1]) {
|
|
coptarg = arg + optpos + 1;
|
|
coptind++;
|
|
optpos = 1;
|
|
return coptopt;
|
|
}
|
|
else if(argv[coptind + 1]) {
|
|
coptarg = argv[coptind + 1];
|
|
coptind += 2;
|
|
optpos = 1;
|
|
return coptopt;
|
|
}
|
|
else {
|
|
if(!arg[++optpos]) {
|
|
coptind++;
|
|
optpos = 1;
|
|
}
|
|
return *optstring == ':' ? ':' : '?';
|
|
}
|
|
}
|
|
else {
|
|
if(!arg[++optpos]) {
|
|
coptind++;
|
|
optpos = 1;
|
|
}
|
|
return coptopt;
|
|
}
|
|
}
|
|
}
|
|
|
|
#ifdef CURL_MEMDEBUG
|
|
static void memory_tracking_init(void)
|
|
{
|
|
const char *env;
|
|
/* if CURL_MEMDEBUG is set, this starts memory tracking message logging */
|
|
env = getenv("CURL_MEMDEBUG");
|
|
if(env) {
|
|
/* use the value as filename */
|
|
curl_dbg_memdebug(env);
|
|
}
|
|
/* if CURL_MEMLIMIT is set, this enables fail-on-alloc-number-N feature */
|
|
env = getenv("CURL_MEMLIMIT");
|
|
if(env) {
|
|
curl_off_t num;
|
|
if(!curlx_str_number(&env, &num, LONG_MAX) && num > 0)
|
|
curl_dbg_memlimit((long)num);
|
|
}
|
|
}
|
|
#else
|
|
#define memory_tracking_init() Curl_nop_stmt
|
|
#endif
|
|
|
|
/* returns a hexdump in a static memory area */
|
|
char *hexdump(const unsigned char *buf, size_t len)
|
|
{
|
|
static char dump[(200 * 3) + 1];
|
|
char *p = dump;
|
|
size_t i;
|
|
if(len > 200)
|
|
return NULL;
|
|
for(i = 0; i < len; i++, p += 3)
|
|
curl_msnprintf(p, 4, "%02x ", buf[i]);
|
|
return dump;
|
|
}
|
|
|
|
#ifndef CURL_DISABLE_WEBSOCKETS
|
|
CURLcode ws_send_ping(CURL *curl, const char *send_payload)
|
|
{
|
|
size_t sent;
|
|
CURLcode result = curl_ws_send(curl, send_payload, strlen(send_payload),
|
|
&sent, 0, CURLWS_PING);
|
|
curl_mfprintf(stderr, "ws: curl_ws_send returned %d, sent %zu\n",
|
|
(int)result, sent);
|
|
return result;
|
|
}
|
|
|
|
CURLcode ws_recv_pong(CURL *curl, const char *expected_payload)
|
|
{
|
|
size_t rlen;
|
|
const struct curl_ws_frame *meta;
|
|
char buffer[256];
|
|
CURLcode result = curl_ws_recv(curl, buffer, sizeof(buffer), &rlen, &meta);
|
|
if(result) {
|
|
curl_mfprintf(stderr, "ws: curl_ws_recv returned %d, received %zu\n",
|
|
(int)result, rlen);
|
|
return result;
|
|
}
|
|
|
|
if(!(meta->flags & CURLWS_PONG)) {
|
|
curl_mfprintf(stderr, "recv_pong: wrong frame, got %zu bytes rflags %x\n",
|
|
rlen, (unsigned int)meta->flags);
|
|
return CURLE_RECV_ERROR;
|
|
}
|
|
|
|
curl_mfprintf(stderr, "ws: got PONG back\n");
|
|
if(rlen == strlen(expected_payload) &&
|
|
!memcmp(expected_payload, buffer, rlen)) {
|
|
curl_mfprintf(stderr, "ws: got the same payload back\n");
|
|
return CURLE_OK;
|
|
}
|
|
curl_mfprintf(stderr, "ws: did NOT get the same payload back\n");
|
|
return CURLE_RECV_ERROR;
|
|
}
|
|
|
|
/* close the connection */
|
|
void ws_close(CURL *curl)
|
|
{
|
|
size_t sent;
|
|
CURLcode result = curl_ws_send(curl, "", 0, &sent, 0, CURLWS_CLOSE);
|
|
curl_mfprintf(stderr, "ws: curl_ws_send returned %d, sent %zu\n",
|
|
(int)result, sent);
|
|
}
|
|
#endif /* CURL_DISABLE_WEBSOCKETS */
|
|
|
|
int main(int argc, const char **argv)
|
|
{
|
|
const char *URL = "";
|
|
CURLcode result;
|
|
entry_func_t entry_func;
|
|
const char *entry_name;
|
|
const char *env;
|
|
size_t tmp;
|
|
|
|
CURL_BINMODE(stdout);
|
|
|
|
memory_tracking_init();
|
|
#ifdef _WIN32
|
|
curlx_now_init();
|
|
#endif
|
|
|
|
/*
|
|
* Setup proper locale from environment. This is needed to enable locale-
|
|
* specific behavior by the C library in order to test for undesired side
|
|
* effects that could cause in libcurl.
|
|
*/
|
|
#ifdef HAVE_SETLOCALE
|
|
setlocale(LC_ALL, "");
|
|
#endif
|
|
|
|
test_argc = argc - 1;
|
|
test_argv = argv + 1;
|
|
|
|
if(argc < 2) {
|
|
curl_mfprintf(stderr, "Pass testname "
|
|
"(and URL as argument for numbered tests) please\n");
|
|
return 1;
|
|
}
|
|
|
|
entry_name = argv[1];
|
|
entry_func = NULL;
|
|
for(tmp = 0; s_entries[tmp].ptr; ++tmp) {
|
|
if(!strcmp(entry_name, s_entries[tmp].name)) {
|
|
entry_func = s_entries[tmp].ptr;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if(!entry_func) {
|
|
curl_mfprintf(stderr, "Test '%s' not found.\n", entry_name);
|
|
return 1;
|
|
}
|
|
|
|
if(argc > 2) {
|
|
URL = argv[2];
|
|
curl_mfprintf(stderr, "URL: %s\n", URL);
|
|
}
|
|
|
|
if(argc > 3)
|
|
libtest_arg2 = argv[3];
|
|
|
|
if(argc > 4)
|
|
libtest_arg3 = argv[4];
|
|
|
|
if(argc > 5)
|
|
libtest_arg4 = argv[5];
|
|
|
|
if(argc > 6)
|
|
libtest_arg5 = argv[6];
|
|
|
|
testnum = 0;
|
|
env = getenv("CURL_TESTNUM");
|
|
if(env) {
|
|
curl_off_t num;
|
|
if(!curlx_str_number(&env, &num, INT_MAX) && num > 0)
|
|
testnum = (int)num;
|
|
}
|
|
|
|
#if defined(UNITTESTS) && !defined(BUILDING_LIBCURL)
|
|
tool_init_stderr();
|
|
#endif
|
|
|
|
result = entry_func(URL);
|
|
curl_mfprintf(stderr, "Test ended with result %d\n", (int)result);
|
|
|
|
#ifdef _WIN32
|
|
/* flush buffers of all streams regardless of mode */
|
|
_flushall();
|
|
#endif
|
|
|
|
/* Regular program status codes are limited to 0..127 and 126 and 127 have
|
|
* special meanings by the shell, so limit a normal return code to 125 */
|
|
return result <= 125 ? result : 125;
|
|
}
|