mirror of
https://github.com/open-goal/jak-project
synced 2026-09-12 12:55:22 -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)
322 lines
15 KiB
C
Vendored
Generated
322 lines
15 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"
|
|
|
|
#ifndef CURL_DISABLE_FTP
|
|
#include "curl_fnmatch.h"
|
|
|
|
/*
|
|
CURL_FNMATCH_MATCH 0
|
|
CURL_FNMATCH_NOMATCH 1
|
|
CURL_FNMATCH_FAIL 2
|
|
*/
|
|
|
|
#define MATCH CURL_FNMATCH_MATCH
|
|
#define NOMATCH CURL_FNMATCH_NOMATCH
|
|
|
|
#define LINUX_DIFFER 0x80
|
|
#define LINUX_SHIFT 8
|
|
#define LINUX_MATCH ((CURL_FNMATCH_MATCH << LINUX_SHIFT) | LINUX_DIFFER)
|
|
#define LINUX_NOMATCH ((CURL_FNMATCH_NOMATCH << LINUX_SHIFT) | LINUX_DIFFER)
|
|
#define LINUX_FAIL ((CURL_FNMATCH_FAIL << LINUX_SHIFT) | LINUX_DIFFER)
|
|
|
|
#define MAC_DIFFER 0x40
|
|
#define MAC_SHIFT 16
|
|
#if 0
|
|
#define MAC_MATCH ((CURL_FNMATCH_MATCH << MAC_SHIFT) | MAC_DIFFER)
|
|
#define MAC_NOMATCH ((CURL_FNMATCH_NOMATCH << MAC_SHIFT) | MAC_DIFFER)
|
|
#endif
|
|
#define MAC_FAIL ((CURL_FNMATCH_FAIL << MAC_SHIFT) | MAC_DIFFER)
|
|
|
|
static const char *ret2name(int i)
|
|
{
|
|
switch(i) {
|
|
case 0:
|
|
return "MATCH";
|
|
case 1:
|
|
return "NOMATCH";
|
|
case 2:
|
|
return "FAIL";
|
|
default:
|
|
return "unknown";
|
|
}
|
|
/* not reached */
|
|
}
|
|
|
|
static CURLcode test_unit1307(const char *arg)
|
|
{
|
|
UNITTEST_BEGIN_SIMPLE
|
|
|
|
struct testcase {
|
|
const char *pattern;
|
|
const char *string;
|
|
int result;
|
|
};
|
|
|
|
static const struct testcase tests[] = {
|
|
/* brackets syntax */
|
|
{"*[*[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[["
|
|
"[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[["
|
|
"[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[\001\177[[[[[[[[[[[[[[[[[[[[[",
|
|
"[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[["
|
|
"[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[["
|
|
"[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[",
|
|
NOMATCH|MAC_FAIL},
|
|
|
|
{ "\\[", "[", MATCH },
|
|
{ "[", "[", NOMATCH|LINUX_MATCH|MAC_FAIL},
|
|
{ "[]", "[]", NOMATCH|LINUX_MATCH|MAC_FAIL},
|
|
{ "[][]", "[", MATCH },
|
|
{ "[][]", "]", MATCH },
|
|
{ "[[]", "[", MATCH },
|
|
{ "[[[]", "[", MATCH },
|
|
{ "[[[[]", "[", MATCH },
|
|
{ "[[[[]", "[", MATCH },
|
|
|
|
{ "[][[]", "]", MATCH },
|
|
{ "[][[[]", "[", MATCH },
|
|
{ "[[]", "]", NOMATCH },
|
|
|
|
{ "[a@]", "a", MATCH },
|
|
|
|
{ "[a-z]", "a", MATCH },
|
|
{ "[a-z]", "A", NOMATCH },
|
|
{ "?[a-z]", "?Z", NOMATCH },
|
|
{ "[A-Z]", "C", MATCH },
|
|
{ "[A-Z]", "c", NOMATCH },
|
|
{ "[0-9]", "7", MATCH },
|
|
{ "[7-8]", "7", MATCH },
|
|
{ "[7-]", "7", MATCH },
|
|
{ "[7-]", "-", MATCH },
|
|
{ "[7-]", "[", NOMATCH },
|
|
{ "[a-bA-F]", "F", MATCH },
|
|
{ "[a-bA-B9]", "9", MATCH },
|
|
{ "[a-bA-B98]", "8", MATCH },
|
|
{ "[a-bA-B98]", "C", NOMATCH },
|
|
{ "[a-bA-Z9]", "F", MATCH },
|
|
{ "[a-bA-Z9]ero*", "Zero chance.", MATCH },
|
|
{ "S[a-][x]opho*", "Saxophone", MATCH },
|
|
{ "S[a-][x]opho*", "SaXophone", NOMATCH },
|
|
{ "S[a-][x]*.txt", "S-x.txt", MATCH },
|
|
{ "[\\a-\\b]", "a", MATCH },
|
|
{ "[\\a-\\b]", "b", MATCH },
|
|
{ "[?*[][?*[][?*[]", "?*[", MATCH },
|
|
{ "[][?*-]", "]", MATCH },
|
|
{ "[][?*-]", "[", MATCH },
|
|
{ "[][?*-]", "?", MATCH },
|
|
{ "[][?*-]", "*", MATCH },
|
|
{ "[][?*-]", "-", MATCH },
|
|
{ "[]?*-]", "-", MATCH },
|
|
{ "[\xFF]", "\xFF", MATCH|LINUX_FAIL|MAC_FAIL},
|
|
{ "?/b/c", "a/b/c", MATCH },
|
|
{ "^_{}~", "^_{}~", MATCH },
|
|
{ "!#%+,-./01234567889", "!#%+,-./01234567889", MATCH },
|
|
{ "PQRSTUVWXYZ]abcdefg", "PQRSTUVWXYZ]abcdefg", MATCH },
|
|
{ ":;=@ABCDEFGHIJKLMNO", ":;=@ABCDEFGHIJKLMNO", MATCH },
|
|
|
|
/* negate */
|
|
{ "[!a]", "b", MATCH },
|
|
{ "[!a]", "a", NOMATCH },
|
|
{ "[^a]", "b", MATCH },
|
|
{ "[^a]", "a", NOMATCH },
|
|
{ "[^a-z0-9A-Z]", "a", NOMATCH },
|
|
{ "[^a-z0-9A-Z]", "-", MATCH },
|
|
{ "curl[!a-z]lib", "curl lib", MATCH },
|
|
{ "curl[! ]lib", "curl lib", NOMATCH },
|
|
{ "[! ][ ]", " ", NOMATCH },
|
|
{ "[! ][ ]", "a ", MATCH },
|
|
{ "*[^a].t?t", "a.txt", NOMATCH },
|
|
{ "*[^a].t?t", "ca.txt", NOMATCH },
|
|
{ "*[^a].t?t", "ac.txt", MATCH },
|
|
{ "*[^a]", "", NOMATCH },
|
|
{ "[!\xFF]", "", NOMATCH|LINUX_FAIL},
|
|
{ "[!\xFF]", "\xFF", NOMATCH|LINUX_FAIL|MAC_FAIL},
|
|
{ "[!\xFF]", "a", MATCH|LINUX_FAIL|MAC_FAIL},
|
|
{ "[!?*[]", "?", NOMATCH },
|
|
{ "[!!]", "!", NOMATCH },
|
|
{ "[!!]", "x", MATCH },
|
|
|
|
{ "[[:alpha:]]", "a", MATCH },
|
|
{ "[[:alpha:]]", "9", NOMATCH },
|
|
{ "[[:alnum:]]", "a", MATCH },
|
|
{ "[[:alnum:]]", "[", NOMATCH },
|
|
{ "[[:alnum:]]", "]", NOMATCH },
|
|
{ "[[:alnum:]]", "9", MATCH },
|
|
{ "[[:digit:]]", "9", MATCH },
|
|
{ "[[:xdigit:]]", "9", MATCH },
|
|
{ "[[:xdigit:]]", "F", MATCH },
|
|
{ "[[:xdigit:]]", "G", NOMATCH },
|
|
{ "[[:upper:]]", "U", MATCH },
|
|
{ "[[:upper:]]", "u", NOMATCH },
|
|
{ "[[:lower:]]", "l", MATCH },
|
|
{ "[[:lower:]]", "L", NOMATCH },
|
|
{ "[[:print:]]", "L", MATCH },
|
|
{ "[[:print:]]", "\10", NOMATCH },
|
|
{ "[[:print:]]", "\10", NOMATCH },
|
|
{ "[[:space:]]", " ", MATCH },
|
|
{ "[[:space:]]", "x", NOMATCH },
|
|
{ "[[:graph:]]", " ", NOMATCH },
|
|
{ "[[:graph:]]", "x", MATCH },
|
|
{ "[[:blank:]]", "\t", MATCH },
|
|
{ "[[:blank:]]", " ", MATCH },
|
|
{ "[[:blank:]]", "\r", NOMATCH },
|
|
{ "[^[:blank:]]", "\t", NOMATCH },
|
|
{ "[^[:print:]]", "\10", MATCH },
|
|
{ "[[:lower:]][[:lower:]]", "ll", MATCH },
|
|
{ "[[:foo:]]", "bar", NOMATCH|MAC_FAIL},
|
|
{ "[[:foo:]]", "f]", MATCH|LINUX_NOMATCH|MAC_FAIL},
|
|
|
|
{ "curl[[:blank:]];-)", "curl ;-)", MATCH },
|
|
{ "*[[:blank:]]*", " ", MATCH },
|
|
{ "*[[:blank:]]*", "", NOMATCH },
|
|
{ "*[[:blank:]]*", "hi, im_Pavel", MATCH },
|
|
|
|
/* common using */
|
|
{ "Filename.dat", "Filename.dat", MATCH },
|
|
{ "*curl*", "lets use curl!!", MATCH },
|
|
{ "filename.txt", "filename.dat", NOMATCH },
|
|
{ "*.txt", "text.txt", MATCH },
|
|
{ "*.txt", "a.txt", MATCH },
|
|
{ "*.txt", ".txt", MATCH },
|
|
{ "*.txt", "txt", NOMATCH },
|
|
{ "??.txt", "99.txt", MATCH },
|
|
{ "??.txt", "a99.txt", NOMATCH },
|
|
{ "?.???", "a.txt", MATCH },
|
|
{ "*.???", "somefile.dat", MATCH },
|
|
{ "*.???", "photo.jpeg", NOMATCH },
|
|
{ ".*", ".htaccess", MATCH },
|
|
{ ".*", ".", MATCH },
|
|
{ ".*", "..", MATCH },
|
|
|
|
/* many stars => one star */
|
|
{ "**.txt", "text.txt", MATCH },
|
|
{ "***.txt", "t.txt", MATCH },
|
|
{ "****.txt", ".txt", MATCH },
|
|
|
|
/* empty string or pattern */
|
|
{ "", "", MATCH },
|
|
{ "", "hello", NOMATCH },
|
|
{ "file", "", NOMATCH },
|
|
{ "?", "", NOMATCH },
|
|
{ "*", "", MATCH },
|
|
{ "x", "", NOMATCH },
|
|
|
|
/* backslash */
|
|
{ "\\", "\\", MATCH|LINUX_NOMATCH},
|
|
{ "\\\\", "\\", MATCH },
|
|
{ "\\\\", "\\\\", NOMATCH },
|
|
{ "\\?", "?", MATCH },
|
|
{ "\\*", "*", MATCH },
|
|
{ "?.txt", "?.txt", MATCH },
|
|
{ "*.txt", "*.txt", MATCH },
|
|
{ "\\?.txt", "?.txt", MATCH },
|
|
{ "\\*.txt", "*.txt", MATCH },
|
|
{ "\\?.txt", "x.txt", NOMATCH },
|
|
{ "\\*.txt", "x.txt", NOMATCH },
|
|
{ "\\*\\\\.txt", "*\\.txt", MATCH },
|
|
{ "*\\**\\?*\\\\*", "cc*cc?cccc", NOMATCH },
|
|
{ "*\\?*\\**", "cc?cc", NOMATCH },
|
|
{ "\\\"\\$\\&\\'\\(\\)", "\"$&'()", MATCH },
|
|
{ "\\*\\?\\[\\\\\\`\\|", "*?[\\`|", MATCH },
|
|
{ "[\\a\\b]c", "ac", MATCH },
|
|
{ "[\\a\\b]c", "bc", MATCH },
|
|
{ "[\\a\\b]d", "bc", NOMATCH },
|
|
{ "[a-bA-B\\?]", "?", MATCH },
|
|
{ "cu[a-ab-b\\r]l", "curl", MATCH },
|
|
{ "[\\a-z]", "c", MATCH },
|
|
|
|
{ "?*?*?.*?*", "abc.c", MATCH },
|
|
{ "?*?*?.*?*", "abcc", NOMATCH },
|
|
{ "?*?*?.*?*", "abc.", NOMATCH },
|
|
{ "?*?*?.*?*", "abc.c++", MATCH },
|
|
{ "?*?*?.*?*", "abcdef.c++", MATCH },
|
|
{ "?*?*?.?", "abcdef.c", MATCH },
|
|
{ "?*?*?.?", "abcdef.cd", NOMATCH },
|
|
|
|
/* https://codepoints.net/U+00E4 Latin Small Letter A with Diaeresis */
|
|
{ "Lindm\xc3\xa4tarv", "Lindm\xc3\xa4tarv", MATCH },
|
|
|
|
{ "", "", MATCH},
|
|
{"**]*[*[\x13]**[*\x13)]*]*[**[*\x13~r-]*]**[.*]*[\xe3\xe3\xe3\xe3\xe3\xe3"
|
|
"\xe3\xe3\xe3\xe3\xe3\xe3\xe3\xe3\xe3\xe3\xe3\xe3\xe3\xe3\xe3\xe3\xe3\xe3"
|
|
"\xe3\xe3\xe3\xe3\xe3*[\x13]**[*\x13)]*]*[*[\x13]*[~r]*]*\xba\x13\xa6~b-]"
|
|
"*",
|
|
"a", NOMATCH|LINUX_FAIL}
|
|
};
|
|
|
|
size_t i;
|
|
|
|
enum system {
|
|
SYSTEM_CUSTOM,
|
|
SYSTEM_LINUX,
|
|
SYSTEM_MACOS
|
|
};
|
|
|
|
enum system machine;
|
|
|
|
#ifdef HAVE_FNMATCH
|
|
#ifdef __APPLE__
|
|
machine = SYSTEM_MACOS;
|
|
#else
|
|
machine = SYSTEM_LINUX;
|
|
#endif
|
|
curl_mprintf("Tested with system fnmatch(), %s-style\n",
|
|
machine == SYSTEM_LINUX ? "linux" : "mac");
|
|
#else
|
|
curl_mprintf("Tested with custom fnmatch()\n");
|
|
machine = SYSTEM_CUSTOM;
|
|
#endif
|
|
|
|
for(i = 0; i < CURL_ARRAYSIZE(tests); i++) {
|
|
int result = tests[i].result;
|
|
int rc = Curl_fnmatch(NULL, tests[i].pattern, tests[i].string);
|
|
if(result & (LINUX_DIFFER | MAC_DIFFER)) {
|
|
if((result & LINUX_DIFFER) && (machine == SYSTEM_LINUX))
|
|
result >>= LINUX_SHIFT;
|
|
else if((result & MAC_DIFFER) && (machine == SYSTEM_MACOS))
|
|
result >>= MAC_SHIFT;
|
|
result &= 0x03; /* filter off all high bits */
|
|
}
|
|
if(rc != result) {
|
|
curl_mprintf("Curl_fnmatch(\"%s\", \"%s\") should return %s (returns %s)"
|
|
" [%zu]\n",
|
|
tests[i].pattern, tests[i].string, ret2name(result),
|
|
ret2name(rc), i);
|
|
fail("pattern mismatch");
|
|
}
|
|
}
|
|
|
|
UNITTEST_END_SIMPLE
|
|
}
|
|
|
|
#else
|
|
|
|
static CURLcode test_unit1307(const char *arg)
|
|
{
|
|
UNITTEST_BEGIN_SIMPLE
|
|
UNITTEST_END_SIMPLE
|
|
}
|
|
|
|
#endif
|