mirror of
https://github.com/open-goal/jak-project
synced 2026-09-12 20:56:09 -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)
171 lines
5.7 KiB
C
Vendored
Generated
171 lines
5.7 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 "unitcheck.h"
|
|
|
|
#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_HSTS)
|
|
#include "urldata.h"
|
|
#include "hsts.h"
|
|
|
|
static void showsts(struct stsentry *e, const char *chost)
|
|
{
|
|
if(!e)
|
|
curl_mprintf("'%s' is not HSTS\n", chost);
|
|
else {
|
|
curl_mprintf("%s [%s]: %" CURL_FORMAT_CURL_OFF_T "%s\n",
|
|
chost, e->host, e->expires,
|
|
e->includeSubDomains ? " includeSubDomains" : "");
|
|
}
|
|
}
|
|
|
|
static CURLcode test_unit1660(const char *arg)
|
|
{
|
|
UNITTEST_BEGIN_SIMPLE
|
|
|
|
struct testit {
|
|
const char *host;
|
|
const char *chost; /* if non-NULL, use to lookup with */
|
|
const char *hdr; /* if NULL, do the lookup */
|
|
const CURLcode result; /* parse result */
|
|
};
|
|
|
|
static const struct testit headers[] = {
|
|
/* two entries read from disk cache, verify first */
|
|
{ "-", "readfrom.example", NULL, CURLE_OK },
|
|
{ "-", "old.example", NULL, CURLE_OK },
|
|
/* delete the remaining one read from disk */
|
|
{ "readfrom.example", NULL, "max-age=\"0\"", CURLE_OK },
|
|
|
|
{ "example.com", NULL, "max-age=\"31536000\"\r\n", CURLE_OK },
|
|
{ "example.com", NULL, "max-age=\"21536000\"\r\n", CURLE_OK },
|
|
{ "example.com", NULL, "max-age=\"21536000\"; \r\n", CURLE_OK },
|
|
{ "example.com", NULL, "max-age=\"21536000\"; includeSubDomains\r\n",
|
|
CURLE_OK },
|
|
{ "example.org", NULL, "max-age=\"31536000\"\r\n", CURLE_OK },
|
|
{ "this.example", NULL, "max=\"31536\";", CURLE_BAD_FUNCTION_ARGUMENT },
|
|
{ "this.example", NULL, "max-age=\"31536", CURLE_BAD_FUNCTION_ARGUMENT },
|
|
{ "this.example", NULL, "max-age=31536\"", CURLE_OK },
|
|
/* max-age=0 removes the entry */
|
|
{ "this.example", NULL, "max-age=0", CURLE_OK },
|
|
{ "another.example", NULL, "includeSubDomains; ",
|
|
CURLE_BAD_FUNCTION_ARGUMENT },
|
|
|
|
/* Two max-age is illegal */
|
|
{ "example.com", NULL,
|
|
"max-age=\"21536000\"; includeSubDomains; max-age=\"3\";",
|
|
CURLE_BAD_FUNCTION_ARGUMENT },
|
|
/* Two includeSubDomains is illegal */
|
|
{ "2.example.com", NULL,
|
|
"max-age=\"21536000\"; includeSubDomains; includeSubDomains;",
|
|
CURLE_BAD_FUNCTION_ARGUMENT },
|
|
/* use an unknown directive "include" that should be ignored */
|
|
{ "3.example.com", NULL,
|
|
"max-age=\"21536000\"; include; includeSubDomains;", CURLE_OK },
|
|
/* remove the "3.example.com" one, should still match the example.com */
|
|
{ "3.example.com", NULL, "max-age=\"0\"; includeSubDomains;", CURLE_OK },
|
|
{ "-", "foo.example.com", NULL, CURLE_OK },
|
|
{ "-", "foo.xample.com", NULL, CURLE_OK },
|
|
|
|
/* should not match */
|
|
{ "example.net", "forexample.net", "max-age=\"31536000\"\r\n", CURLE_OK },
|
|
|
|
/* should not match either, since forexample.net is not in the example.net
|
|
domain */
|
|
{ "example.net", "forexample.net",
|
|
"max-age=\"31536000\"; includeSubDomains\r\n", CURLE_OK },
|
|
/* remove example.net again */
|
|
{ "example.net", NULL, "max-age=\"0\"; includeSubDomains\r\n", CURLE_OK },
|
|
|
|
/* make this live for 7 seconds */
|
|
{ "expire.example", NULL, "max-age=\"7\"\r\n", CURLE_OK },
|
|
{ NULL, NULL, NULL, CURLE_OK }
|
|
};
|
|
|
|
CURLcode result;
|
|
struct stsentry *e;
|
|
struct hsts *h = Curl_hsts_init();
|
|
int i;
|
|
const char *chost;
|
|
CURL *easy;
|
|
char savename[256];
|
|
|
|
abort_unless(h, "Curl_hsts_init()");
|
|
|
|
curl_global_init(CURL_GLOBAL_ALL);
|
|
easy = curl_easy_init();
|
|
if(!easy) {
|
|
Curl_hsts_cleanup(&h);
|
|
curl_global_cleanup();
|
|
abort_unless(easy, "curl_easy_init()");
|
|
}
|
|
|
|
Curl_hsts_loadfile(easy, h, arg);
|
|
|
|
for(i = 0; headers[i].host; i++) {
|
|
if(headers[i].hdr) {
|
|
result = Curl_hsts_parse(h, headers[i].host, headers[i].hdr);
|
|
|
|
if(result != headers[i].result) {
|
|
curl_mfprintf(stderr, "Curl_hsts_parse(%s) failed: %d\n",
|
|
headers[i].hdr, (int)result);
|
|
unitfail++;
|
|
continue;
|
|
}
|
|
else if(result) {
|
|
curl_mprintf("Input %d: error %d\n", i, (int)result);
|
|
continue;
|
|
}
|
|
}
|
|
|
|
chost = headers[i].chost ? headers[i].chost : headers[i].host;
|
|
e = hsts_check(h, chost, strlen(chost), TRUE);
|
|
showsts(e, chost);
|
|
}
|
|
|
|
curl_mprintf("Number of entries: %zu\n", Curl_llist_count(&h->list));
|
|
|
|
/* verify that it is exists for 7 seconds */
|
|
chost = "expire.example";
|
|
for(i = 100; i < 110; i++) {
|
|
e = hsts_check(h, chost, strlen(chost), TRUE);
|
|
showsts(e, chost);
|
|
deltatime++; /* another second passed */
|
|
}
|
|
|
|
curl_msnprintf(savename, sizeof(savename), "%s.save", arg);
|
|
(void)Curl_hsts_save(easy, h, savename);
|
|
Curl_hsts_cleanup(&h);
|
|
curl_easy_cleanup(easy);
|
|
curl_global_cleanup();
|
|
|
|
UNITTEST_END(curl_global_cleanup())
|
|
}
|
|
#else
|
|
static CURLcode test_unit1660(const char *arg)
|
|
{
|
|
UNITTEST_BEGIN_SIMPLE
|
|
puts("nothing to do when HTTP or HSTS are disabled");
|
|
UNITTEST_END_SIMPLE
|
|
}
|
|
#endif
|