mirror of
https://github.com/open-goal/jak-project
synced 2026-08-21 06:38:33 -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)
172 lines
6.1 KiB
C
Vendored
Generated
172 lines
6.1 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 "first.h"
|
|
|
|
/*
|
|
Check range/resume returned error codes and data presence.
|
|
|
|
The input parameters are:
|
|
- CURLOPT_RANGE/CURLOPT_RESUME_FROM
|
|
- CURLOPT_FAILONERROR
|
|
- Returned http code (2xx/416)
|
|
- Content-Range header present in reply.
|
|
|
|
*/
|
|
|
|
#define F_RESUME (1 << 0) /* resume/range. */
|
|
#define F_HTTP416 (1 << 1) /* Server returns http code 416. */
|
|
#define F_FAIL (1 << 2) /* Fail on error. */
|
|
#define F_CONTENTRANGE (1 << 3) /* Server sends content-range hdr. */
|
|
#define F_IGNOREBODY (1 << 4) /* Body should be ignored. */
|
|
|
|
struct testparams {
|
|
unsigned int flags; /* ORed flags as above. */
|
|
CURLcode result; /* Code that should be returned by curl_easy_perform(). */
|
|
};
|
|
|
|
static const struct testparams testparams[] = {
|
|
{ 0, CURLE_OK },
|
|
{ F_CONTENTRANGE, CURLE_OK },
|
|
{ F_FAIL, CURLE_OK },
|
|
{ F_FAIL | F_CONTENTRANGE, CURLE_OK },
|
|
{ F_HTTP416, CURLE_OK },
|
|
{ F_HTTP416 | F_CONTENTRANGE, CURLE_OK },
|
|
{ F_HTTP416 | F_FAIL | F_IGNOREBODY,
|
|
CURLE_HTTP_RETURNED_ERROR },
|
|
{ F_HTTP416 | F_FAIL | F_CONTENTRANGE | F_IGNOREBODY,
|
|
CURLE_HTTP_RETURNED_ERROR },
|
|
{ F_RESUME | F_IGNOREBODY,
|
|
CURLE_RANGE_ERROR },
|
|
{ F_RESUME | F_CONTENTRANGE, CURLE_OK },
|
|
{ F_RESUME | F_FAIL | F_IGNOREBODY,
|
|
CURLE_RANGE_ERROR },
|
|
{ F_RESUME | F_FAIL | F_CONTENTRANGE, CURLE_OK },
|
|
{ F_RESUME | F_HTTP416 | F_IGNOREBODY, CURLE_OK },
|
|
{ F_RESUME | F_HTTP416 | F_CONTENTRANGE | F_IGNOREBODY, CURLE_OK },
|
|
{ F_RESUME | F_HTTP416 | F_FAIL | F_IGNOREBODY, CURLE_OK },
|
|
{ F_RESUME | F_HTTP416 | F_FAIL | F_CONTENTRANGE | F_IGNOREBODY,
|
|
CURLE_OK }
|
|
};
|
|
|
|
static int hasbody;
|
|
|
|
static size_t writedata(char *data, size_t size, size_t nmemb, void *userdata)
|
|
{
|
|
(void)data;
|
|
(void)userdata;
|
|
|
|
if(size && nmemb)
|
|
hasbody = 1;
|
|
return size * nmemb;
|
|
}
|
|
|
|
static int onetest(CURL *curl, const char *url, const struct testparams *p,
|
|
size_t num)
|
|
{
|
|
CURLcode result;
|
|
unsigned int replyselector;
|
|
char urlbuf[256];
|
|
|
|
replyselector = (p->flags & F_CONTENTRANGE) ? 1 : 0;
|
|
if(p->flags & F_HTTP416)
|
|
replyselector += 2;
|
|
curl_msnprintf(urlbuf, sizeof(urlbuf), "%s%04u", url, replyselector);
|
|
easy_setopt(curl, CURLOPT_URL, urlbuf);
|
|
easy_setopt(curl, CURLOPT_VERBOSE, 1L);
|
|
easy_setopt(curl, CURLOPT_RESUME_FROM, (p->flags & F_RESUME) ? 3L : 0L);
|
|
easy_setopt(curl, CURLOPT_RANGE, !(p->flags & F_RESUME) ?
|
|
"3-1000000" : (char *)NULL);
|
|
easy_setopt(curl, CURLOPT_FAILONERROR, (p->flags & F_FAIL) ? 1L : 0L);
|
|
hasbody = 0;
|
|
result = curl_easy_perform(curl);
|
|
if(result != p->result) {
|
|
curl_mprintf("%zu: bad error code (%d): resume=%s, fail=%s, http416=%s, "
|
|
"content-range=%s, expected=%d\n", num, (int)result,
|
|
(p->flags & F_RESUME) ? "yes" : "no",
|
|
(p->flags & F_FAIL) ? "yes" : "no",
|
|
(p->flags & F_HTTP416) ? "yes" : "no",
|
|
(p->flags & F_CONTENTRANGE) ? "yes" : "no",
|
|
(int)p->result);
|
|
return 1;
|
|
}
|
|
if(hasbody && (p->flags & F_IGNOREBODY)) {
|
|
curl_mprintf("body should be ignored and is not: resume=%s, fail=%s, "
|
|
"http416=%s, content-range=%s\n",
|
|
(p->flags & F_RESUME) ? "yes" : "no",
|
|
(p->flags & F_FAIL) ? "yes" : "no",
|
|
(p->flags & F_HTTP416) ? "yes" : "no",
|
|
(p->flags & F_CONTENTRANGE) ? "yes" : "no");
|
|
return 1;
|
|
}
|
|
return 0;
|
|
|
|
test_cleanup:
|
|
|
|
return 1;
|
|
}
|
|
|
|
/* for debugging: */
|
|
/* #define SINGLETEST 9 */
|
|
|
|
static CURLcode test_lib1156(const char *URL)
|
|
{
|
|
CURLcode result;
|
|
CURL *curl;
|
|
size_t i;
|
|
int status = 0;
|
|
|
|
if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
|
|
curl_mfprintf(stderr, "curl_global_init() failed\n");
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
|
|
for(i = 0; i < CURL_ARRAYSIZE(testparams); i++) {
|
|
curl = curl_easy_init();
|
|
if(!curl) {
|
|
curl_mfprintf(stderr, "curl_easy_init() failed\n");
|
|
curl_global_cleanup();
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
|
|
easy_setopt(curl, CURLOPT_WRITEFUNCTION, writedata);
|
|
|
|
#ifdef SINGLETEST
|
|
if(SINGLETEST == i)
|
|
#endif
|
|
status |= onetest(curl, URL, testparams + i, i);
|
|
curl_easy_cleanup(curl);
|
|
}
|
|
|
|
curl_global_cleanup();
|
|
curl_mprintf("%d\n", status);
|
|
return status ? TEST_ERR_FAILURE : CURLE_OK;
|
|
|
|
test_cleanup:
|
|
|
|
curl_easy_cleanup(curl);
|
|
curl_global_cleanup();
|
|
|
|
return result;
|
|
}
|