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)
117 lines
4.1 KiB
C
Vendored
Generated
117 lines
4.1 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"
|
|
|
|
static CURLcode test_lib1922(const char *URL)
|
|
{
|
|
CURLcode result = CURLE_OK;
|
|
CURL *curl = NULL;
|
|
CURL *dup = NULL;
|
|
struct curl_slist *resolve = NULL;
|
|
char resolve_entry[256];
|
|
char direct_url[256];
|
|
char http_url[256];
|
|
char proxy_url[256];
|
|
const char *effective = NULL;
|
|
const char *host = libtest_arg2; /* %HOSTIP */
|
|
const char *httpport = libtest_arg3; /* %HTTPPORT */
|
|
const char *proxyport = libtest_arg4;/* %PROXYPORT */
|
|
|
|
(void)URL;
|
|
|
|
if(!host || !httpport || !proxyport) {
|
|
curl_mfprintf(stderr,
|
|
"Usage: lib1922 - <host> <httpport> <proxyport>\n");
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
|
|
/* Synthetic DNS so hsts.example.com resolves to the test server. */
|
|
curl_msnprintf(resolve_entry, sizeof(resolve_entry),
|
|
"hsts.example.com:%s:%s", httpport, host);
|
|
resolve = curl_slist_append(NULL, resolve_entry);
|
|
if(!resolve) {
|
|
return CURLE_OUT_OF_MEMORY;
|
|
}
|
|
|
|
curl_msnprintf(direct_url, sizeof(direct_url),
|
|
"http://hsts.example.com:%s/%d", httpport, 1922);
|
|
curl_msnprintf(http_url, sizeof(http_url),
|
|
"http://hsts.example.com/%d", 1922);
|
|
curl_msnprintf(proxy_url, sizeof(proxy_url),
|
|
"http://%s:%s", host, proxyport);
|
|
|
|
global_init(CURL_GLOBAL_ALL);
|
|
easy_init(curl);
|
|
|
|
easy_setopt(curl, CURLOPT_WRITEFUNCTION, tutil_throwaway_cb);
|
|
easy_setopt(curl, CURLOPT_RESOLVE, resolve);
|
|
easy_setopt(curl, CURLOPT_URL, direct_url);
|
|
easy_setopt(curl, CURLOPT_HSTS_CTRL, CURLHSTS_ENABLE);
|
|
|
|
/* Direct HTTP request: Server returns Strict-Transport-Security.
|
|
* CURL_HSTS_HTTP env var (set in the test) allows processing it over
|
|
* HTTP in debug builds, populating the live HSTS cache. */
|
|
result = curl_easy_perform(curl);
|
|
if(result) {
|
|
curl_mfprintf(stderr, "First perform failed: %d (%s)\n",
|
|
(int)result, curl_easy_strerror(result));
|
|
goto test_cleanup;
|
|
}
|
|
curl_mprintf("First request: HSTS cache populated\n");
|
|
|
|
dup = curl_easy_duphandle(curl);
|
|
if(!dup) {
|
|
result = CURLE_FAILED_INIT;
|
|
goto test_cleanup;
|
|
}
|
|
|
|
/* Point the dup at the plain HTTP URL for the same hostname, via a proxy.
|
|
* The copied HSTS cache upgrades the URL to HTTPS, causing a CONNECT to
|
|
* port 443. The test proxy rejects CONNECT with 403, so curl returns
|
|
* CURLE_COULDNT_CONNECT (7). The CONNECT to port 443 is itself the proof
|
|
* of the upgrade. */
|
|
easy_setopt(dup, CURLOPT_URL, http_url);
|
|
easy_setopt(dup, CURLOPT_PROXY, proxy_url);
|
|
|
|
result = curl_easy_perform(dup);
|
|
if(result != CURLE_COULDNT_CONNECT) {
|
|
curl_mfprintf(stderr, "Dup perform unexpected result: %d (%s)\n",
|
|
(int)result, curl_easy_strerror(result));
|
|
goto test_cleanup;
|
|
}
|
|
|
|
/* Confirm the dup's URL was upgraded to HTTPS by the copied HSTS cache. */
|
|
curl_easy_getinfo(dup, CURLINFO_EFFECTIVE_URL, &effective);
|
|
if(effective) {
|
|
curl_mprintf("Dup effective URL: %s\n", effective);
|
|
}
|
|
|
|
test_cleanup:
|
|
curl_easy_cleanup(curl);
|
|
curl_easy_cleanup(dup);
|
|
curl_slist_free_all(resolve);
|
|
curl_global_cleanup();
|
|
return result;
|
|
}
|