mirror of
https://github.com/open-goal/jak-project
synced 2026-09-12 12:55:22 -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)
118 lines
3.3 KiB
C
Vendored
Generated
118 lines
3.3 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"
|
|
|
|
static CURLcode t1396_setup(void)
|
|
{
|
|
CURLcode result = CURLE_OK;
|
|
global_init(CURL_GLOBAL_ALL);
|
|
return result;
|
|
}
|
|
|
|
static void t1396_stop(CURL *easy)
|
|
{
|
|
if(easy)
|
|
curl_easy_cleanup(easy);
|
|
curl_global_cleanup();
|
|
}
|
|
|
|
static CURLcode test_unit1396(const char *arg)
|
|
{
|
|
CURL *easy;
|
|
|
|
UNITTEST_BEGIN(t1396_setup())
|
|
|
|
struct test {
|
|
const char *in;
|
|
int inlen;
|
|
const char *out;
|
|
int outlen;
|
|
};
|
|
|
|
/* unescape, this => that */
|
|
const struct test list1[] = {
|
|
{ "%61", 3, "a", 1 },
|
|
{ "%61a", 4, "aa", 2 },
|
|
{ "%61b", 4, "ab", 2 },
|
|
{ "%6 1", 4, "%6 1", 4 },
|
|
{ "%61", 1, "%", 1 },
|
|
{ "%61", 2, "%6", 2 },
|
|
{ "%6%a", 4, "%6%a", 4 },
|
|
{ "%6a", 0, "j", 1 },
|
|
{ "%FF", 0, "\xff", 1 },
|
|
{ "%FF%00%ff", 9, "\xff\x00\xff", 3 },
|
|
{ "%-2", 0, "%-2", 3 },
|
|
{ "%FG", 0, "%FG", 3 },
|
|
{ NULL, 0, NULL, 0 } /* end of list marker */
|
|
};
|
|
/* escape, this => that */
|
|
const struct test list2[] = {
|
|
{ "a", 1, "a", 1 },
|
|
{ "/", 1, "%2F", 3 },
|
|
{ "a=b", 3, "a%3Db", 5 },
|
|
{ "a=b", 0, "a%3Db", 5 },
|
|
{ "a=b", 1, "a", 1 },
|
|
{ "a=b", 2, "a%3D", 4 },
|
|
{ "1/./0", 5, "1%2F.%2F0", 9 },
|
|
{ "-._~!#%&", 0, "-._~%21%23%25%26", 16 },
|
|
{ "a", 2, "a%00", 4 },
|
|
{ "a\xff\x01g", 4, "a%FF%01g", 8 },
|
|
{ NULL, 0, NULL, 0 } /* end of list marker */
|
|
};
|
|
int i;
|
|
|
|
easy = curl_easy_init();
|
|
abort_unless(easy, "returned NULL!");
|
|
for(i = 0; list1[i].in; i++) {
|
|
int outlen;
|
|
char *out = curl_easy_unescape(easy, list1[i].in, list1[i].inlen, &outlen);
|
|
|
|
abort_unless(out, "returned NULL!");
|
|
fail_unless(outlen == list1[i].outlen, "wrong output length returned");
|
|
fail_unless(!memcmp(out, list1[i].out, list1[i].outlen),
|
|
"bad output data returned");
|
|
|
|
curl_mprintf("curl_easy_unescape test %d DONE\n", i);
|
|
|
|
curl_free(out);
|
|
}
|
|
|
|
for(i = 0; list2[i].in; i++) {
|
|
int outlen;
|
|
char *out = curl_easy_escape(easy, list2[i].in, list2[i].inlen);
|
|
abort_unless(out, "returned NULL!");
|
|
|
|
outlen = (int)strlen(out);
|
|
fail_unless(outlen == list2[i].outlen, "wrong output length returned");
|
|
fail_unless(!memcmp(out, list2[i].out, list2[i].outlen),
|
|
"bad output data returned");
|
|
|
|
curl_mprintf("curl_easy_escape test %d DONE (%s)\n", i, out);
|
|
|
|
curl_free(out);
|
|
}
|
|
|
|
UNITTEST_END(t1396_stop(easy))
|
|
}
|