mirror of
https://github.com/open-goal/jak-project
synced 2026-08-26 16:16:36 -04:00
Alexander J. Semenuk
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)
490 lines
12 KiB
C
Vendored
Generated
490 lines
12 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"
|
|
|
|
#ifdef HAVE_NETINET_IN_H
|
|
#include <netinet/in.h>
|
|
#endif
|
|
#ifdef HAVE_NETINET_IN6_H
|
|
#include <netinet/in6.h>
|
|
#endif
|
|
|
|
static CURLcode t1664_setup(void)
|
|
{
|
|
CURLcode result = CURLE_OK;
|
|
global_init(CURL_GLOBAL_ALL);
|
|
return result;
|
|
}
|
|
|
|
static CURLcode test_unit1664(const char *arg)
|
|
{
|
|
UNITTEST_BEGIN(t1664_setup())
|
|
|
|
static const char *wordparse[] = {
|
|
"word",
|
|
"word ",
|
|
" word ",
|
|
"wo rd",
|
|
"word(",
|
|
"wor(d",
|
|
"perfect",
|
|
"",
|
|
"longerth",
|
|
NULL
|
|
};
|
|
|
|
int i;
|
|
curl_mprintf("curlx_str_word\n");
|
|
for(i = 0; wordparse[i]; i++) {
|
|
struct Curl_str out;
|
|
const char *line = wordparse[i];
|
|
const char *orgline = line;
|
|
int rc = curlx_str_word(&line, &out, 7);
|
|
curl_mprintf("%d: (\"%s\") %d, \"%.*s\" [%d], line %d\n",
|
|
i, orgline, rc, (int)out.len, out.str, (int)out.len,
|
|
(int)(line - orgline));
|
|
}
|
|
|
|
curl_mprintf("curlx_str_until\n");
|
|
for(i = 0; wordparse[i]; i++) {
|
|
struct Curl_str out;
|
|
const char *line = wordparse[i];
|
|
const char *orgline = line;
|
|
int rc = curlx_str_until(&line, &out, 7, 'd');
|
|
curl_mprintf("%d: (\"%s\") %d, \"%.*s\" [%d], line %d\n",
|
|
i, orgline, rc, (int)out.len, out.str, (int)out.len,
|
|
(int)(line - orgline));
|
|
}
|
|
|
|
{
|
|
static const char *qwords[] = {
|
|
"\"word\"",
|
|
"\"word",
|
|
"word\"",
|
|
"\"word\"\"",
|
|
"\"word\" ",
|
|
" \"word\"",
|
|
"\"perfect\"",
|
|
"\"p r e t\"",
|
|
"\"perfec\\\"",
|
|
"\"trail\\\"\"",
|
|
"\"trail2\\\"\"",
|
|
"\"trail33\\\"\"",
|
|
"\"0\\\\\\\\\\\\\"",
|
|
"\"1\\\\\\\\\\\\\\\"",
|
|
"\"\"",
|
|
"",
|
|
"\"longerth\"",
|
|
NULL
|
|
};
|
|
|
|
curl_mprintf("curlx_str_quotedword\n");
|
|
for(i = 0; qwords[i]; i++) {
|
|
struct Curl_str out;
|
|
const char *line = qwords[i];
|
|
const char *orgline = line;
|
|
int rc = curlx_str_quotedword(&line, &out, 7);
|
|
curl_mprintf("%d: (\"%s\") %d, \"%.*s\" [%d], line %d\n",
|
|
i, orgline, rc, (int)out.len, out.str, (int)out.len,
|
|
(int)(line - orgline));
|
|
}
|
|
}
|
|
|
|
{
|
|
static const char *single[] = {
|
|
"a",
|
|
"aa",
|
|
"A",
|
|
"b",
|
|
"\\",
|
|
" ",
|
|
"",
|
|
NULL
|
|
};
|
|
curl_mprintf("curlx_str_single\n");
|
|
for(i = 0; single[i]; i++) {
|
|
const char *line = single[i];
|
|
const char *orgline = line;
|
|
int rc = curlx_str_single(&line, 'a');
|
|
curl_mprintf("%d: (\"%s\") %d, line %d\n",
|
|
i, orgline, rc, (int)(line - orgline));
|
|
}
|
|
}
|
|
|
|
{
|
|
static const char *single[] = {
|
|
"a",
|
|
"aa",
|
|
"A",
|
|
"b",
|
|
"\\",
|
|
" ",
|
|
"\t",
|
|
"\n",
|
|
"",
|
|
NULL
|
|
};
|
|
curl_mprintf("curlx_str_singlespace\n");
|
|
for(i = 0; single[i]; i++) {
|
|
const char *line = single[i];
|
|
const char *orgline = line;
|
|
int rc = curlx_str_singlespace(&line);
|
|
curl_mprintf("%d: (\"%s\") %d, line %d\n",
|
|
i, orgline, rc, (int)(line - orgline));
|
|
}
|
|
}
|
|
|
|
{
|
|
static const char *single[] = {
|
|
"a",
|
|
"aa",
|
|
"A",
|
|
"b",
|
|
"\\",
|
|
" ",
|
|
"",
|
|
NULL
|
|
};
|
|
curl_mprintf("curlx_str_single\n");
|
|
for(i = 0; single[i]; i++) {
|
|
const char *line = single[i];
|
|
const char *orgline = line;
|
|
int rc = curlx_str_single(&line, 'a');
|
|
curl_mprintf("%d: (\"%s\") %d, line %d\n",
|
|
i, orgline, rc, (int)(line - orgline));
|
|
}
|
|
}
|
|
|
|
{
|
|
static const char *nums[] = {
|
|
"1",
|
|
"10000",
|
|
"1234",
|
|
"1235",
|
|
"1236",
|
|
"01234",
|
|
"00000000000000000000000000001234",
|
|
"0123 345",
|
|
"0123O345",
|
|
"-12",
|
|
" 123",
|
|
"",
|
|
NULL
|
|
};
|
|
curl_mprintf("curlx_str_number\n");
|
|
for(i = 0; nums[i]; i++) {
|
|
curl_off_t num;
|
|
const char *line = nums[i];
|
|
const char *orgline = line;
|
|
int rc = curlx_str_number(&line, &num, 1235);
|
|
curl_mprintf("%d: (\"%s\") %d, [%" CURL_FORMAT_CURL_OFF_T "] line %d\n",
|
|
i, orgline, rc, num, (int)(line - orgline));
|
|
}
|
|
}
|
|
|
|
{
|
|
struct t {
|
|
const char *str;
|
|
curl_off_t max;
|
|
};
|
|
static struct t nums[] = {
|
|
{ "00", 8},
|
|
{ "1", 8},
|
|
{ "1", 1},
|
|
{ "2", 1},
|
|
{ "2", 2},
|
|
{ "5", 6},
|
|
{ "000000000000000000000006", 6},
|
|
{ "7", 6},
|
|
{ "8", 6},
|
|
{ "9", 8},
|
|
{ "10", 10},
|
|
{ "11", 10},
|
|
{ "12", 10},
|
|
{NULL, 0}
|
|
};
|
|
curl_mprintf("curlx_str_number varying max\n");
|
|
for(i = 0; nums[i].str; i++) {
|
|
curl_off_t num;
|
|
const char *line = nums[i].str;
|
|
const char *orgline = line;
|
|
int rc = curlx_str_number(&line, &num, nums[i].max);
|
|
curl_mprintf("%d: (\"%s\") max %" CURL_FORMAT_CURL_OFF_T
|
|
" == %d, [%" CURL_FORMAT_CURL_OFF_T "]\n",
|
|
i, orgline, nums[i].max, rc, num);
|
|
}
|
|
}
|
|
|
|
{
|
|
struct t {
|
|
const char *str;
|
|
curl_off_t max;
|
|
};
|
|
static struct t nums[] = {
|
|
{ "00", 8},
|
|
{ "1", 8},
|
|
{ "1", 1},
|
|
{ "2", 1},
|
|
{ "2", 2},
|
|
{ "5", 6},
|
|
{ "000000000000000000000006", 6},
|
|
{ "7", 6},
|
|
{ "8", 6},
|
|
{ "9", 8},
|
|
{ "a", 14},
|
|
{ "b", 14},
|
|
{ "c", 14},
|
|
{ "d", 14},
|
|
{ "e", 14},
|
|
{ "f", 14},
|
|
{ "f", 15},
|
|
{ "10", 16},
|
|
{ "11", 16},
|
|
{ "12", 16},
|
|
{NULL, 0}
|
|
};
|
|
curl_mprintf("curlx_str_hex varying max\n");
|
|
for(i = 0; nums[i].str; i++) {
|
|
curl_off_t num;
|
|
const char *line = nums[i].str;
|
|
const char *orgline = line;
|
|
int rc = curlx_str_hex(&line, &num, nums[i].max);
|
|
curl_mprintf("%d: (\"%s\") max %" CURL_FORMAT_CURL_OFF_T
|
|
" == %d, [%" CURL_FORMAT_CURL_OFF_T "]\n",
|
|
i, orgline, nums[i].max, rc, num);
|
|
}
|
|
}
|
|
|
|
{
|
|
struct t {
|
|
const char *str;
|
|
curl_off_t max;
|
|
};
|
|
static struct t nums[] = {
|
|
{ "00", 4},
|
|
{ "1", 4},
|
|
{ "1", 4},
|
|
{ "2", 4},
|
|
{ "3", 4},
|
|
{ "4", 4},
|
|
{ "5", 4},
|
|
{ "000000000000000000000006", 6},
|
|
{ "7", 7},
|
|
{ "10", 8},
|
|
{ "11", 8},
|
|
{ "11", 9},
|
|
{ "12", 9},
|
|
{ "13", 9},
|
|
{ "8", 10},
|
|
{NULL, 0}
|
|
};
|
|
curl_mprintf("curlx_str_octal varying max\n");
|
|
for(i = 0; nums[i].str; i++) {
|
|
curl_off_t num;
|
|
const char *line = nums[i].str;
|
|
const char *orgline = line;
|
|
int rc = curlx_str_octal(&line, &num, nums[i].max);
|
|
curl_mprintf("%d: (\"%s\") max %" CURL_FORMAT_CURL_OFF_T
|
|
" == %d, [%" CURL_FORMAT_CURL_OFF_T "]\n",
|
|
i, orgline, nums[i].max, rc, num);
|
|
}
|
|
}
|
|
|
|
{
|
|
/* CURL_OFF_T is typically 9223372036854775807 */
|
|
static const char *nums[] = {
|
|
"9223372036854775807", /* 2^63 -1 */
|
|
"9223372036854775808", /* 2^63 */
|
|
"18446744073709551615", /* 2^64 - 1 */
|
|
"18446744073709551616", /* 2^64 */
|
|
"18446744073709551617", /* 2^64 + 1 */
|
|
"0123456799a",
|
|
"0123456789",
|
|
"123498760b",
|
|
"1234987607611298232",
|
|
"1111111111111111111",
|
|
"2222222222222222222",
|
|
"00000000000000000000000000000009223372036854775807",
|
|
"3333333333333333333",
|
|
"4444444444444444444",
|
|
"5555555555555555555",
|
|
"6666666666666666666",
|
|
"7777777777777777777",
|
|
"8888888888888888888",
|
|
"999999999999999999",
|
|
NULL
|
|
};
|
|
curl_mprintf("curlx_str_number / max\n");
|
|
for(i = 0; nums[i]; i++) {
|
|
curl_off_t num;
|
|
const char *line = nums[i];
|
|
const char *orgline = line;
|
|
int rc = curlx_str_number(&line, &num, CURL_OFF_T_MAX);
|
|
curl_mprintf("%d: (\"%s\") %d, [%" CURL_FORMAT_CURL_OFF_T "] line %d\n",
|
|
i, orgline, rc, num, (int)(line - orgline));
|
|
}
|
|
}
|
|
|
|
{
|
|
static const char *newl[] = {
|
|
"a",
|
|
"aa",
|
|
"A",
|
|
"b",
|
|
"\\",
|
|
" ",
|
|
"\n",
|
|
"\r",
|
|
"\r\n",
|
|
"\x0c",
|
|
"",
|
|
NULL
|
|
};
|
|
curl_mprintf("curlx_str_newline\n");
|
|
for(i = 0; newl[i]; i++) {
|
|
const char *line = newl[i];
|
|
const char *orgline = line;
|
|
int rc = curlx_str_newline(&line);
|
|
curl_mprintf("%d: (%%%02x) %d, line %d\n",
|
|
i, (unsigned int)*orgline, rc, (int)(line - orgline));
|
|
}
|
|
}
|
|
|
|
{
|
|
static const char *nums[] = {
|
|
"1",
|
|
"1000",
|
|
"1234",
|
|
"1235",
|
|
"1236",
|
|
"01234",
|
|
"00000000000000000000000000001234",
|
|
"0123 345",
|
|
"0123O345",
|
|
"-12",
|
|
" 123",
|
|
"",
|
|
NULL
|
|
};
|
|
curl_mprintf("curlx_str_hex\n");
|
|
for(i = 0; nums[i]; i++) {
|
|
curl_off_t num;
|
|
const char *line = nums[i];
|
|
const char *orgline = line;
|
|
int rc = curlx_str_hex(&line, &num, 0x1235);
|
|
curl_mprintf("%d: (\"%s\") %d, [%" CURL_FORMAT_CURL_OFF_T "] line %d\n",
|
|
i, orgline, rc, num, (int)(line - orgline));
|
|
}
|
|
}
|
|
|
|
{
|
|
static const char *nums[] = {
|
|
"1",
|
|
"1000",
|
|
"1234",
|
|
"1235",
|
|
"1236",
|
|
"01234",
|
|
"00000000000000000000000000001234",
|
|
"0123 345",
|
|
"0123O345",
|
|
"-12",
|
|
" 123",
|
|
"",
|
|
NULL
|
|
};
|
|
curl_mprintf("curlx_str_octal\n");
|
|
for(i = 0; nums[i]; i++) {
|
|
curl_off_t num;
|
|
const char *line = nums[i];
|
|
const char *orgline = line;
|
|
int rc = curlx_str_octal(&line, &num, 01235);
|
|
curl_mprintf("%d: (\"%s\") %d, [%" CURL_FORMAT_CURL_OFF_T "] line %d\n",
|
|
i, orgline, rc, num, (int)(line - orgline));
|
|
}
|
|
}
|
|
|
|
{
|
|
/* CURL_OFF_T is typically 2^63-1 */
|
|
static const char *nums[] = {
|
|
"777777777777777777777", /* 2^63 -1 */
|
|
"1000000000000000000000", /* 2^63 */
|
|
"111111111111111111111",
|
|
"222222222222222222222",
|
|
"333333333333333333333",
|
|
"444444444444444444444",
|
|
"555555555555555555555",
|
|
"666666666666666666666",
|
|
NULL
|
|
};
|
|
curl_mprintf("curlx_str_octal / max\n");
|
|
for(i = 0; nums[i]; i++) {
|
|
curl_off_t num;
|
|
const char *line = nums[i];
|
|
const char *orgline = line;
|
|
int rc = curlx_str_octal(&line, &num, CURL_OFF_T_MAX);
|
|
curl_mprintf("%d: (\"%s\") %d, [%" CURL_FORMAT_CURL_OFF_T "] line %d\n",
|
|
i, orgline, rc, num, (int)(line - orgline));
|
|
}
|
|
}
|
|
|
|
{
|
|
/* CURL_OFF_T is typically 2^63-1 */
|
|
static const char *nums[] = {
|
|
"7FFFFFFFFFFFFFFF", /* 2^63 -1 */
|
|
"8000000000000000", /* 2^63 */
|
|
"1111111111111111",
|
|
"2222222222222222",
|
|
"3333333333333333",
|
|
"4444444444444444",
|
|
"5555555555555555",
|
|
"6666666666666666",
|
|
"7777777777777777",
|
|
"888888888888888",
|
|
"999999999999999",
|
|
"aaaaaaaaAAAAAAA",
|
|
"bbbbbbbbBBBBBBB",
|
|
"BBBBBBBBbbbbbbb",
|
|
"ccccccccCCCCCCC",
|
|
"ddddddddDDDDDDD",
|
|
"eeeeeeeeEEEEEEE",
|
|
"ffffffffFFFFFFF",
|
|
"abcdef",
|
|
"ABCDEF",
|
|
NULL
|
|
};
|
|
curl_mprintf("curlx_str_hex / max\n");
|
|
for(i = 0; nums[i]; i++) {
|
|
curl_off_t num;
|
|
const char *line = nums[i];
|
|
const char *orgline = line;
|
|
int rc = curlx_str_hex(&line, &num, CURL_OFF_T_MAX);
|
|
curl_mprintf("%d: (\"%s\") %d, [%" CURL_FORMAT_CURL_OFF_T "] line %d\n",
|
|
i, orgline, rc, num, (int)(line - orgline));
|
|
}
|
|
}
|
|
|
|
UNITTEST_END(curl_global_cleanup())
|
|
}
|