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)
250 lines
5.9 KiB
C
Vendored
Generated
250 lines
5.9 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
|
|
*
|
|
***************************************************************************/
|
|
/* This is the 'proxyauth.c' test app posted by Shmulik Regev on the libcurl
|
|
* mailing list on 10 Jul 2007, converted to a test case.
|
|
*
|
|
* argv1 = URL
|
|
* argv2 = proxy
|
|
* argv3 = proxyuser:password
|
|
* argv4 = hostname to use for the custom Host: header
|
|
*/
|
|
|
|
#include "first.h"
|
|
|
|
static CURL *t540_curl[2];
|
|
|
|
static CURLcode init(int num, CURLM *multi, const char *url,
|
|
const char *userpwd, struct curl_slist *headers)
|
|
{
|
|
CURLcode result = CURLE_OK;
|
|
|
|
const char *proxy = libtest_arg2;
|
|
|
|
res_easy_init(t540_curl[num]);
|
|
if(result)
|
|
goto init_failed;
|
|
|
|
res_easy_setopt(t540_curl[num], CURLOPT_URL, url);
|
|
if(result)
|
|
goto init_failed;
|
|
|
|
res_easy_setopt(t540_curl[num], CURLOPT_PROXY, proxy);
|
|
if(result)
|
|
goto init_failed;
|
|
|
|
res_easy_setopt(t540_curl[num], CURLOPT_PROXYUSERPWD, userpwd);
|
|
if(result)
|
|
goto init_failed;
|
|
|
|
res_easy_setopt(t540_curl[num], CURLOPT_PROXYAUTH, CURLAUTH_ANY);
|
|
if(result)
|
|
goto init_failed;
|
|
|
|
res_easy_setopt(t540_curl[num], CURLOPT_VERBOSE, 1L);
|
|
if(result)
|
|
goto init_failed;
|
|
|
|
res_easy_setopt(t540_curl[num], CURLOPT_HEADER, 1L);
|
|
if(result)
|
|
goto init_failed;
|
|
|
|
/* custom Host: */
|
|
res_easy_setopt(t540_curl[num], CURLOPT_HTTPHEADER, headers);
|
|
if(result)
|
|
goto init_failed;
|
|
|
|
res_multi_add_handle(multi, t540_curl[num]);
|
|
if(result)
|
|
goto init_failed;
|
|
|
|
return CURLE_OK; /* success */
|
|
|
|
init_failed:
|
|
|
|
curl_easy_cleanup(t540_curl[num]);
|
|
t540_curl[num] = NULL;
|
|
|
|
return result; /* failure */
|
|
}
|
|
|
|
static CURLcode loop(int num, CURLM *multi, const char *url,
|
|
const char *userpwd, struct curl_slist *headers)
|
|
{
|
|
CURLMsg *msg;
|
|
long L;
|
|
int Q, U = -1;
|
|
fd_set R, W, E;
|
|
struct timeval T;
|
|
CURLcode result = CURLE_OK;
|
|
|
|
result = init(num, multi, url, userpwd, headers);
|
|
if(result)
|
|
return result;
|
|
|
|
while(U) {
|
|
|
|
int M = -99;
|
|
|
|
res_multi_perform(multi, &U);
|
|
if(result)
|
|
return result;
|
|
|
|
res_test_timedout();
|
|
if(result)
|
|
return result;
|
|
|
|
if(U) {
|
|
FD_ZERO(&R);
|
|
FD_ZERO(&W);
|
|
FD_ZERO(&E);
|
|
|
|
res_multi_fdset(multi, &R, &W, &E, &M);
|
|
if(result)
|
|
return result;
|
|
|
|
/* At this point, M is guaranteed to be greater or equal than -1. */
|
|
|
|
res_multi_timeout(multi, &L);
|
|
if(result)
|
|
return result;
|
|
|
|
/* At this point, L is guaranteed to be greater or equal than -1. */
|
|
|
|
if(L != -1) {
|
|
int itimeout;
|
|
#if LONG_MAX > INT_MAX
|
|
itimeout = (L > INT_MAX) ? INT_MAX : (int)L;
|
|
#else
|
|
itimeout = (int)L;
|
|
#endif
|
|
T.tv_sec = itimeout / 1000;
|
|
T.tv_usec = (itimeout % 1000) * 1000;
|
|
}
|
|
else {
|
|
T.tv_sec = 5;
|
|
T.tv_usec = 0;
|
|
}
|
|
|
|
res_select_test(M + 1, &R, &W, &E, &T);
|
|
if(result)
|
|
return result;
|
|
}
|
|
|
|
while(1) {
|
|
msg = curl_multi_info_read(multi, &Q);
|
|
if(!msg)
|
|
break;
|
|
if(msg->msg == CURLMSG_DONE) {
|
|
size_t i;
|
|
CURL *curl = msg->easy_handle;
|
|
curl_mfprintf(stderr, "R: %d - %s\n", (int)msg->data.result,
|
|
curl_easy_strerror(msg->data.result));
|
|
curl_multi_remove_handle(multi, curl);
|
|
curl_easy_cleanup(curl);
|
|
for(i = 0; i < CURL_ARRAYSIZE(t540_curl); i++) {
|
|
if(t540_curl[i] == curl) {
|
|
t540_curl[i] = NULL;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
else
|
|
curl_mfprintf(stderr, "E: CURLMsg (%d)\n", (int)msg->msg);
|
|
}
|
|
|
|
res_test_timedout();
|
|
if(result)
|
|
return result;
|
|
}
|
|
|
|
return CURLE_OK;
|
|
}
|
|
|
|
static CURLcode test_lib540(const char *URL)
|
|
{
|
|
CURLM *multi = NULL;
|
|
struct curl_slist *headers = NULL;
|
|
char buffer[246]; /* naively fixed-size */
|
|
CURLcode result = CURLE_OK;
|
|
size_t i;
|
|
|
|
const char *proxyuserpws = libtest_arg3;
|
|
const char *host;
|
|
|
|
for(i = 0; i < CURL_ARRAYSIZE(t540_curl); i++)
|
|
t540_curl[i] = NULL;
|
|
|
|
start_test_timing();
|
|
|
|
if(test_argc < 4)
|
|
return TEST_ERR_MAJOR_BAD;
|
|
|
|
host = test_argv[4];
|
|
curl_msnprintf(buffer, sizeof(buffer), "Host: %s", host);
|
|
|
|
/* now add a custom Host: header */
|
|
headers = curl_slist_append(headers, buffer);
|
|
if(!headers) {
|
|
curl_mfprintf(stderr, "curl_slist_append() failed\n");
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
|
|
res_global_init(CURL_GLOBAL_ALL);
|
|
if(result) {
|
|
curl_slist_free_all(headers);
|
|
return result;
|
|
}
|
|
|
|
res_multi_init(multi);
|
|
if(result) {
|
|
curl_global_cleanup();
|
|
curl_slist_free_all(headers);
|
|
return result;
|
|
}
|
|
|
|
result = loop(0, multi, URL, proxyuserpws, headers);
|
|
if(result)
|
|
goto test_cleanup;
|
|
|
|
curl_mfprintf(stderr, "lib540: now we do the request again\n");
|
|
|
|
result = loop(1, multi, URL, proxyuserpws, headers);
|
|
|
|
test_cleanup:
|
|
|
|
/* proper cleanup sequence - type PB */
|
|
|
|
for(i = 0; i < CURL_ARRAYSIZE(t540_curl); i++) {
|
|
curl_multi_remove_handle(multi, t540_curl[i]);
|
|
curl_easy_cleanup(t540_curl[i]);
|
|
}
|
|
|
|
curl_multi_cleanup(multi);
|
|
curl_global_cleanup();
|
|
|
|
curl_slist_free_all(headers);
|
|
|
|
return result;
|
|
}
|