mirror of
https://github.com/open-goal/jak-project
synced 2026-08-28 08:49:16 -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)
148 lines
7.3 KiB
C
Vendored
Generated
148 lines
7.3 KiB
C
Vendored
Generated
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
* Copyright (C) Evgeny Grin (Karlson2k), <k2k@narod.ru>.
|
|
*
|
|
* 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"
|
|
#include "curl_sha512_256.h"
|
|
|
|
static CURLcode test_unit1615(const char *arg)
|
|
{
|
|
UNITTEST_BEGIN_SIMPLE
|
|
|
|
#ifdef CURL_HAVE_SHA512_256
|
|
|
|
static const char test_str1[] = "1";
|
|
static const unsigned char precomp_hash1[CURL_SHA512_256_DIGEST_LENGTH] = {
|
|
0x18, 0xd2, 0x75, 0x66, 0xbd, 0x1a, 0xc6, 0x6b, 0x23, 0x32, 0xd8,
|
|
0xc5, 0x4a, 0xd4, 0x3f, 0x7b, 0xb2, 0x20, 0x79, 0xc9, 0x06, 0xd0,
|
|
0x5f, 0x49, 0x1f, 0x3f, 0x07, 0xa2, 0x8d, 0x5c, 0x69, 0x90
|
|
};
|
|
static const char test_str2[] = "hello-you-fool";
|
|
static const unsigned char precomp_hash2[CURL_SHA512_256_DIGEST_LENGTH] = {
|
|
0xaf, 0x6f, 0xb4, 0xb0, 0x13, 0x9b, 0xee, 0x13, 0xd1, 0x95, 0x3c,
|
|
0xb8, 0xc7, 0xcd, 0x5b, 0x19, 0xf9, 0xcd, 0xcd, 0x21, 0xef, 0xdf,
|
|
0xa7, 0x42, 0x5c, 0x07, 0x13, 0xea, 0xcc, 0x1a, 0x39, 0x76
|
|
};
|
|
static const char test_str3[] = "abc";
|
|
static const unsigned char precomp_hash3[CURL_SHA512_256_DIGEST_LENGTH] = {
|
|
0x53, 0x04, 0x8E, 0x26, 0x81, 0x94, 0x1E, 0xF9, 0x9B, 0x2E, 0x29,
|
|
0xB7, 0x6B, 0x4C, 0x7D, 0xAB, 0xE4, 0xC2, 0xD0, 0xC6, 0x34, 0xFC,
|
|
0x6D, 0x46, 0xE0, 0xE2, 0xF1, 0x31, 0x07, 0xE7, 0xAF, 0x23
|
|
};
|
|
static const char test_str4[] = ""; /* empty, zero size input */
|
|
static const unsigned char precomp_hash4[CURL_SHA512_256_DIGEST_LENGTH] = {
|
|
0xc6, 0x72, 0xb8, 0xd1, 0xef, 0x56, 0xed, 0x28, 0xab, 0x87, 0xc3,
|
|
0x62, 0x2c, 0x51, 0x14, 0x06, 0x9b, 0xdd, 0x3a, 0xd7, 0xb8, 0xf9,
|
|
0x73, 0x74, 0x98, 0xd0, 0xc0, 0x1e, 0xce, 0xf0, 0x96, 0x7a
|
|
};
|
|
static const char test_str5[] =
|
|
"abcdefghijklmnopqrstuvwxyzzyxwvutsrqponMLKJIHGFEDCBA"
|
|
"abcdefghijklmnopqrstuvwxyzzyxwvutsrqponMLKJIHGFEDCBA";
|
|
static const unsigned char precomp_hash5[CURL_SHA512_256_DIGEST_LENGTH] = {
|
|
0xad, 0xe9, 0x5d, 0x55, 0x3b, 0x9e, 0x45, 0x69, 0xdb, 0x53, 0xa4,
|
|
0x04, 0x92, 0xe7, 0x87, 0x94, 0xff, 0xc9, 0x98, 0x5f, 0x93, 0x03,
|
|
0x86, 0x45, 0xe1, 0x97, 0x17, 0x72, 0x7c, 0xbc, 0x31, 0x15
|
|
};
|
|
static const char test_str6[] =
|
|
"/long/long/long/long/long/long/long/long/long/long/long"
|
|
"/long/long/long/long/long/long/long/long/long/long/long"
|
|
"/long/long/long/long/long/long/long/long/long/long/long"
|
|
"/long/long/long/long/long/long/long/long/long/long/long"
|
|
"/long/long/long/long/long/long/long/long/long/long/long"
|
|
"/long/long/long/long/long/long/long/long/long/long/long"
|
|
"/long/long/long/long/path?with%20some=parameters";
|
|
static const unsigned char precomp_hash6[CURL_SHA512_256_DIGEST_LENGTH] = {
|
|
0xbc, 0xab, 0xc6, 0x2c, 0x0a, 0x22, 0xd5, 0xcb, 0xac, 0xac, 0xe9,
|
|
0x25, 0xcf, 0xce, 0xaa, 0xaf, 0x0e, 0xa1, 0xed, 0x42, 0x46, 0x8a,
|
|
0xe2, 0x01, 0xee, 0x2f, 0xdb, 0x39, 0x75, 0x47, 0x73, 0xf1
|
|
};
|
|
static const char test_str7[] = "Simple string.";
|
|
static const unsigned char precomp_hash7[CURL_SHA512_256_DIGEST_LENGTH] = {
|
|
0xde, 0xcb, 0x3c, 0x81, 0x65, 0x4b, 0xa0, 0xf5, 0xf0, 0x45, 0x6b,
|
|
0x7e, 0x61, 0xf5, 0x0d, 0xf5, 0x38, 0xa4, 0xfc, 0xb1, 0x8a, 0x95,
|
|
0xff, 0x59, 0xbc, 0x04, 0x82, 0xcf, 0x23, 0xb2, 0x32, 0x56
|
|
};
|
|
static const unsigned char test_seq8[] = {
|
|
255, 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, 243, 242, 241,
|
|
240, 239, 238, 237, 236, 235, 234, 233, 232, 231, 230, 229, 228, 227, 226,
|
|
225, 224, 223, 222, 221, 220, 219, 218, 217, 216, 215, 214, 213, 212, 211,
|
|
210, 209, 208, 207, 206, 205, 204, 203, 202, 201, 200, 199, 198, 197, 196,
|
|
195, 194, 193, 192, 191, 190, 189, 188, 187, 186, 185, 184, 183, 182, 181,
|
|
180, 179, 178, 177, 176, 175, 174, 173, 172, 171, 170, 169, 168, 167, 166,
|
|
165, 164, 163, 162, 161, 160, 159, 158, 157, 156, 155, 154, 153, 152, 151,
|
|
150, 149, 148, 147, 146, 145, 144, 143, 142, 141, 140, 139, 138, 137, 136,
|
|
135, 134, 133, 132, 131, 130, 129, 128, 127, 126, 125, 124, 123, 122, 121,
|
|
120, 119, 118, 117, 116, 115, 114, 113, 112, 111, 110, 109, 108, 107, 106,
|
|
105, 104, 103, 102, 101, 100, 99, 98, 97, 96, 95, 94, 93, 92, 91,
|
|
90, 89, 88, 87, 86, 85, 84, 83, 82, 81, 80, 79, 78, 77, 76,
|
|
75, 74, 73, 72, 71, 70, 69, 68, 67, 66, 65, 64, 63, 62, 61,
|
|
60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46,
|
|
45, 44, 43, 42, 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31,
|
|
30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16,
|
|
15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1
|
|
}; /* 255..1 sequence */
|
|
static const unsigned char precomp_hash8[CURL_SHA512_256_DIGEST_LENGTH] = {
|
|
0x22, 0x31, 0xf2, 0xa1, 0xb4, 0x89, 0xb2, 0x44, 0xf7, 0x66, 0xa0,
|
|
0xb8, 0x31, 0xed, 0xb7, 0x73, 0x8a, 0x34, 0xdc, 0x11, 0xc8, 0x2c,
|
|
0xf2, 0xb5, 0x88, 0x60, 0x39, 0x6b, 0x5c, 0x06, 0x70, 0x37
|
|
};
|
|
|
|
unsigned char output_buf[CURL_SHA512_256_DIGEST_LENGTH];
|
|
|
|
Curl_sha512_256it(output_buf, (const unsigned char *)test_str1,
|
|
CURL_ARRAYSIZE(test_str1) - 1);
|
|
verify_memory(output_buf, precomp_hash1, CURL_SHA512_256_DIGEST_LENGTH);
|
|
|
|
Curl_sha512_256it(output_buf, (const unsigned char *)test_str2,
|
|
CURL_ARRAYSIZE(test_str2) - 1);
|
|
verify_memory(output_buf, precomp_hash2, CURL_SHA512_256_DIGEST_LENGTH);
|
|
|
|
Curl_sha512_256it(output_buf, (const unsigned char *)test_str3,
|
|
CURL_ARRAYSIZE(test_str3) - 1);
|
|
verify_memory(output_buf, precomp_hash3, CURL_SHA512_256_DIGEST_LENGTH);
|
|
|
|
Curl_sha512_256it(output_buf, (const unsigned char *)test_str4,
|
|
CURL_ARRAYSIZE(test_str4) - 1);
|
|
verify_memory(output_buf, precomp_hash4, CURL_SHA512_256_DIGEST_LENGTH);
|
|
|
|
Curl_sha512_256it(output_buf, (const unsigned char *)test_str5,
|
|
CURL_ARRAYSIZE(test_str5) - 1);
|
|
verify_memory(output_buf, precomp_hash5, CURL_SHA512_256_DIGEST_LENGTH);
|
|
|
|
Curl_sha512_256it(output_buf, (const unsigned char *)test_str6,
|
|
CURL_ARRAYSIZE(test_str6) - 1);
|
|
verify_memory(output_buf, precomp_hash6, CURL_SHA512_256_DIGEST_LENGTH);
|
|
|
|
Curl_sha512_256it(output_buf, (const unsigned char *)test_str7,
|
|
CURL_ARRAYSIZE(test_str7) - 1);
|
|
verify_memory(output_buf, precomp_hash7, CURL_SHA512_256_DIGEST_LENGTH);
|
|
|
|
Curl_sha512_256it(output_buf, test_seq8,
|
|
CURL_ARRAYSIZE(test_seq8));
|
|
verify_memory(output_buf, precomp_hash8, CURL_SHA512_256_DIGEST_LENGTH);
|
|
|
|
#endif /* CURL_HAVE_SHA512_256 */
|
|
|
|
UNITTEST_END_SIMPLE
|
|
}
|