mirror of
https://github.com/open-goal/jak-project
synced 2026-08-07 02:06:59 -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)
210 lines
6.2 KiB
C
Vendored
Generated
210 lines
6.2 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"
|
|
|
|
struct t554_WriteThis {
|
|
const char *readptr;
|
|
size_t sizeleft;
|
|
};
|
|
|
|
static size_t t554_read_cb(char *ptr, size_t size, size_t nmemb, void *userp)
|
|
{
|
|
struct t554_WriteThis *pooh = (struct t554_WriteThis *)userp;
|
|
|
|
if(size * nmemb < 1)
|
|
return 0;
|
|
|
|
if(pooh->sizeleft) {
|
|
*ptr = pooh->readptr[0]; /* copy one single byte */
|
|
pooh->readptr++; /* advance pointer */
|
|
pooh->sizeleft--; /* less data left */
|
|
return 1; /* we return 1 byte at a time! */
|
|
}
|
|
|
|
return 0; /* no more data left to deliver */
|
|
}
|
|
|
|
static size_t t587_read_cb(char *ptr, size_t size, size_t nmemb, void *userp)
|
|
{
|
|
(void)ptr;
|
|
(void)size;
|
|
(void)nmemb;
|
|
(void)userp;
|
|
return CURL_READFUNC_ABORT;
|
|
}
|
|
|
|
static CURLcode t554_test_once(const char *URL, bool oldstyle)
|
|
{
|
|
static const char testdata[] =
|
|
"this is what we post to the silly web server\n";
|
|
|
|
CURL *curl;
|
|
CURLcode result = CURLE_OK;
|
|
CURLFORMcode formrc;
|
|
|
|
struct curl_httppost *formpost = NULL;
|
|
struct curl_httppost *lastptr = NULL;
|
|
struct t554_WriteThis pooh;
|
|
struct t554_WriteThis pooh2;
|
|
|
|
pooh.readptr = testdata;
|
|
pooh.sizeleft = sizeof(testdata) - 1;
|
|
|
|
/* Fill in the file upload field */
|
|
if(oldstyle) {
|
|
formrc = curl_formadd(&formpost,
|
|
&lastptr,
|
|
CURLFORM_COPYNAME, "sendfile",
|
|
CURLFORM_STREAM, &pooh,
|
|
CURLFORM_CONTENTSLENGTH, (long)pooh.sizeleft,
|
|
CURLFORM_FILENAME, "postit2.c",
|
|
CURLFORM_END);
|
|
}
|
|
else {
|
|
/* new style */
|
|
formrc = curl_formadd(&formpost,
|
|
&lastptr,
|
|
CURLFORM_COPYNAME, "sendfile alternative",
|
|
CURLFORM_STREAM, &pooh,
|
|
CURLFORM_CONTENTLEN, (curl_off_t)pooh.sizeleft,
|
|
CURLFORM_FILENAME, "filename 2 ",
|
|
CURLFORM_END);
|
|
}
|
|
|
|
if(formrc)
|
|
curl_mprintf("curl_formadd(1) = %d\n", (int)formrc);
|
|
|
|
/* Now add the same data with another name and make it not look like
|
|
a file upload but still using the callback */
|
|
|
|
pooh2.readptr = testdata;
|
|
pooh2.sizeleft = sizeof(testdata) - 1;
|
|
|
|
/* Fill in the file upload field */
|
|
formrc = curl_formadd(&formpost,
|
|
&lastptr,
|
|
CURLFORM_COPYNAME, "callbackdata",
|
|
CURLFORM_STREAM, &pooh2,
|
|
CURLFORM_CONTENTSLENGTH, (long)pooh2.sizeleft,
|
|
CURLFORM_END);
|
|
|
|
if(formrc)
|
|
curl_mprintf("curl_formadd(2) = %d\n", (int)formrc);
|
|
|
|
/* Fill in the filename field */
|
|
formrc = curl_formadd(&formpost,
|
|
&lastptr,
|
|
CURLFORM_COPYNAME, "filename",
|
|
CURLFORM_COPYCONTENTS, "postit2.c",
|
|
CURLFORM_END);
|
|
if(formrc)
|
|
curl_mprintf("curl_formadd(3) = %d\n", (int)formrc);
|
|
|
|
/* Fill in a submit field too */
|
|
formrc = curl_formadd(&formpost,
|
|
&lastptr,
|
|
CURLFORM_COPYNAME, "submit",
|
|
CURLFORM_COPYCONTENTS, "send",
|
|
CURLFORM_CONTENTTYPE, "text/plain",
|
|
CURLFORM_END);
|
|
|
|
if(formrc)
|
|
curl_mprintf("curl_formadd(4) = %d\n", (int)formrc);
|
|
|
|
formrc = curl_formadd(&formpost, &lastptr,
|
|
CURLFORM_COPYNAME, "somename",
|
|
CURLFORM_BUFFER, "somefile.txt",
|
|
CURLFORM_BUFFERPTR, "blah blah",
|
|
CURLFORM_BUFFERLENGTH, 9L,
|
|
CURLFORM_END);
|
|
|
|
if(formrc)
|
|
curl_mprintf("curl_formadd(5) = %d\n", (int)formrc);
|
|
|
|
curl = curl_easy_init();
|
|
if(!curl) {
|
|
curl_mfprintf(stderr, "curl_easy_init() failed\n");
|
|
curl_formfree(formpost);
|
|
curl_global_cleanup();
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
|
|
/* First set the URL that is about to receive our POST. */
|
|
easy_setopt(curl, CURLOPT_URL, URL);
|
|
|
|
/* Now specify we want to POST data */
|
|
easy_setopt(curl, CURLOPT_POST, 1L);
|
|
|
|
/* Set the expected POST size */
|
|
easy_setopt(curl, CURLOPT_POSTFIELDSIZE, (long)pooh.sizeleft);
|
|
|
|
/* we want to use our own read function */
|
|
if(testnum == 587) {
|
|
easy_setopt(curl, CURLOPT_READFUNCTION, t587_read_cb);
|
|
}
|
|
else {
|
|
easy_setopt(curl, CURLOPT_READFUNCTION, t554_read_cb);
|
|
}
|
|
|
|
/* send a multi-part formpost */
|
|
easy_setopt(curl, CURLOPT_HTTPPOST, formpost);
|
|
|
|
/* get verbose debug output please */
|
|
easy_setopt(curl, CURLOPT_VERBOSE, 1L);
|
|
|
|
/* include headers in the output */
|
|
easy_setopt(curl, CURLOPT_HEADER, 1L);
|
|
|
|
/* Perform the request, result gets the return code */
|
|
result = curl_easy_perform(curl);
|
|
|
|
test_cleanup:
|
|
|
|
/* always cleanup */
|
|
curl_easy_cleanup(curl);
|
|
|
|
/* now cleanup the formpost chain */
|
|
curl_formfree(formpost);
|
|
|
|
return result;
|
|
}
|
|
|
|
static CURLcode test_lib554(const char *URL)
|
|
{
|
|
CURLcode result;
|
|
|
|
if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
|
|
curl_mfprintf(stderr, "curl_global_init() failed\n");
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
|
|
result = t554_test_once(URL, TRUE); /* old */
|
|
if(!result)
|
|
result = t554_test_once(URL, FALSE); /* new */
|
|
|
|
curl_global_cleanup();
|
|
|
|
return result;
|
|
}
|