mirror of
https://github.com/open-goal/jak-project
synced 2026-08-08 02:31:30 -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)
183 lines
5.3 KiB
C
Vendored
Generated
183 lines
5.3 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"
|
|
|
|
#include "testtrace.h"
|
|
|
|
#ifndef CURL_DISABLE_FTP
|
|
|
|
struct test_cli_ftp_upload_data {
|
|
const char *data;
|
|
size_t data_len;
|
|
size_t offset;
|
|
int done;
|
|
};
|
|
|
|
static size_t test_cli_ftp_upload_read(char *buf,
|
|
size_t nitems, size_t blen,
|
|
void *userdata)
|
|
{
|
|
struct test_cli_ftp_upload_data *d = userdata;
|
|
size_t nread = d->data_len - d->offset;
|
|
|
|
if(nread) {
|
|
if(nread > (nitems * blen))
|
|
nread = (nitems * blen);
|
|
memcpy(buf, d->data + d->offset, nread);
|
|
d->offset += nread;
|
|
}
|
|
else
|
|
d->done = 1;
|
|
return nread;
|
|
}
|
|
|
|
static void usage_ftp_upload(const char *msg)
|
|
{
|
|
if(msg)
|
|
curl_mfprintf(stderr, "%s\n", msg);
|
|
curl_mfprintf(stderr,
|
|
"usage: [options] url\n"
|
|
" -r <host>:<port>:<addr> resolve information\n"
|
|
);
|
|
}
|
|
|
|
#endif
|
|
|
|
static CURLcode test_cli_ftp_upload(const char *URL)
|
|
{
|
|
#ifndef CURL_DISABLE_FTP
|
|
CURLM *multi_handle;
|
|
CURL *curl_handle;
|
|
int running_handles = 0;
|
|
int max_fd = -1;
|
|
struct timeval timeout;
|
|
fd_set fdread;
|
|
fd_set fdwrite;
|
|
fd_set fdexcep;
|
|
struct test_cli_ftp_upload_data data;
|
|
struct curl_slist *host = NULL;
|
|
const char *resolve = NULL, *url;
|
|
int ch;
|
|
CURLcode result = CURLE_FAILED_INIT;
|
|
curl_off_t uploadsize = -1;
|
|
|
|
timeout.tv_sec = 1;
|
|
timeout.tv_usec = 0;
|
|
|
|
(void)URL;
|
|
while((ch = cgetopt(test_argc, test_argv, "r:")) != -1) {
|
|
switch(ch) {
|
|
case 'r':
|
|
resolve = coptarg;
|
|
break;
|
|
default:
|
|
usage_ftp_upload("unknown option");
|
|
return (CURLcode)1;
|
|
}
|
|
}
|
|
test_argc -= coptind;
|
|
test_argv += coptind;
|
|
if(test_argc != 1) {
|
|
usage_ftp_upload("not enough arguments");
|
|
return (CURLcode)2;
|
|
}
|
|
url = test_argv[0];
|
|
|
|
if(resolve)
|
|
host = curl_slist_append(NULL, resolve);
|
|
|
|
memset(&data, 0, sizeof(data));
|
|
data.data = "abcdefghijklmnopqrstuvwxyz"
|
|
"ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
|
|
data.data_len = strlen(data.data);
|
|
|
|
curl_global_init(CURL_GLOBAL_ALL);
|
|
multi_handle = curl_multi_init();
|
|
curl_handle = curl_easy_init();
|
|
|
|
curl_easy_setopt(curl_handle, CURLOPT_FTPPORT, "-");
|
|
curl_easy_setopt(curl_handle, CURLOPT_FTP_USE_EPRT, 1L);
|
|
curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0L);
|
|
curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0L);
|
|
curl_easy_setopt(curl_handle, CURLOPT_USE_SSL, CURLUSESSL_TRY);
|
|
curl_easy_setopt(curl_handle, CURLOPT_URL, url);
|
|
curl_easy_setopt(curl_handle, CURLOPT_USERPWD, NULL);
|
|
curl_easy_setopt(curl_handle, CURLOPT_FTP_CREATE_MISSING_DIRS,
|
|
CURLFTP_CREATE_DIR);
|
|
curl_easy_setopt(curl_handle, CURLOPT_UPLOAD, 1L);
|
|
curl_easy_setopt(curl_handle, CURLOPT_READFUNCTION,
|
|
test_cli_ftp_upload_read);
|
|
curl_easy_setopt(curl_handle, CURLOPT_READDATA, &data);
|
|
curl_easy_setopt(curl_handle, CURLOPT_INFILESIZE_LARGE, uploadsize);
|
|
|
|
curl_easy_setopt(curl_handle, CURLOPT_VERBOSE, 1L);
|
|
curl_easy_setopt(curl_handle, CURLOPT_DEBUGFUNCTION, cli_debug_cb);
|
|
if(host)
|
|
curl_easy_setopt(curl_handle, CURLOPT_RESOLVE, host);
|
|
|
|
curl_multi_add_handle(multi_handle, curl_handle);
|
|
curl_multi_perform(multi_handle, &running_handles);
|
|
while(running_handles && !data.done) {
|
|
FD_ZERO(&fdread);
|
|
FD_ZERO(&fdwrite);
|
|
FD_ZERO(&fdexcep);
|
|
|
|
curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &max_fd);
|
|
select(max_fd + 1, &fdread, &fdwrite, &fdexcep, &timeout);
|
|
curl_multi_perform(multi_handle, &running_handles);
|
|
}
|
|
while(running_handles) {
|
|
curl_mfprintf(stderr, "reports to hang herel\n");
|
|
curl_multi_perform(multi_handle, &running_handles);
|
|
}
|
|
|
|
while(1) {
|
|
int msgq = 0;
|
|
struct CURLMsg *msg = curl_multi_info_read(multi_handle, &msgq);
|
|
if(msg && (msg->msg == CURLMSG_DONE)) {
|
|
if(msg->easy_handle == curl_handle) {
|
|
result = msg->data.result;
|
|
}
|
|
}
|
|
else
|
|
break;
|
|
}
|
|
|
|
curl_multi_remove_handle(multi_handle, curl_handle);
|
|
|
|
curl_easy_reset(curl_handle);
|
|
curl_easy_cleanup(curl_handle);
|
|
curl_multi_cleanup(multi_handle);
|
|
curl_global_cleanup();
|
|
curl_slist_free_all(host);
|
|
|
|
curl_mfprintf(stderr, "transfer result: %d\n", (int)result);
|
|
return result;
|
|
#else /* !CURL_DISABLE_FTP */
|
|
(void)URL;
|
|
curl_mfprintf(stderr, "FTP not enabled in libcurl\n");
|
|
return (CURLcode)1;
|
|
#endif /* CURL_DISABLE_FTP */
|
|
}
|