mirror of
https://github.com/open-goal/jak-project
synced 2026-08-20 14:24:45 -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)
151 lines
4.2 KiB
C
Vendored
Generated
151 lines
4.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"
|
|
|
|
static CURLcode test_lib525(const char *URL)
|
|
{
|
|
CURLcode result = CURLE_OK;
|
|
CURL *curl = NULL;
|
|
char errbuf[STRERROR_LEN];
|
|
FILE *hd_src = NULL;
|
|
int hd;
|
|
curlx_struct_stat file_info;
|
|
CURLM *multi = NULL;
|
|
int running;
|
|
|
|
start_test_timing();
|
|
|
|
if(!libtest_arg2) {
|
|
curl_mfprintf(stderr, "Usage: test [url] [uploadfile]\n");
|
|
return TEST_ERR_USAGE;
|
|
}
|
|
|
|
hd_src = curlx_fopen(libtest_arg2, "rb");
|
|
if(!hd_src) {
|
|
curl_mfprintf(stderr, "fopen() failed with error (%d) %s\n",
|
|
errno, curlx_strerror(errno, errbuf, sizeof(errbuf)));
|
|
curl_mfprintf(stderr, "Error opening file '%s'\n", libtest_arg2);
|
|
return TEST_ERR_FOPEN;
|
|
}
|
|
|
|
/* get the file size of the local file */
|
|
hd = curlx_fstat(fileno(hd_src), &file_info);
|
|
if(hd == -1) {
|
|
/* cannot open file, bail out */
|
|
curl_mfprintf(stderr, "fstat() failed with error (%d) %s\n",
|
|
errno, curlx_strerror(errno, errbuf, sizeof(errbuf)));
|
|
curl_mfprintf(stderr, "Error opening file '%s'\n", libtest_arg2);
|
|
curlx_fclose(hd_src);
|
|
return TEST_ERR_FSTAT;
|
|
}
|
|
|
|
res_global_init(CURL_GLOBAL_ALL);
|
|
if(result) {
|
|
curlx_fclose(hd_src);
|
|
return result;
|
|
}
|
|
|
|
easy_init(curl);
|
|
|
|
/* enable uploading */
|
|
easy_setopt(curl, CURLOPT_UPLOAD, 1L);
|
|
|
|
/* specify target */
|
|
easy_setopt(curl, CURLOPT_URL, URL);
|
|
|
|
/* go verbose */
|
|
easy_setopt(curl, CURLOPT_VERBOSE, 1L);
|
|
|
|
/* use active FTP */
|
|
easy_setopt(curl, CURLOPT_FTPPORT, "-");
|
|
|
|
/* now specify which file to upload */
|
|
easy_setopt(curl, CURLOPT_READDATA, hd_src);
|
|
|
|
/* NOTE: if you want this code to work on Windows with libcurl as a DLL, you
|
|
MUST also provide a read callback with CURLOPT_READFUNCTION. Failing to
|
|
do so gives you a crash since a DLL may not use the variable's memory
|
|
when passed in to it from an app like this. */
|
|
|
|
/* Set the size of the file to upload (optional). If you give a *_LARGE
|
|
option you MUST make sure that the type of the passed-in argument is a
|
|
curl_off_t. If you use CURLOPT_INFILESIZE (without _LARGE) you must
|
|
make sure that to pass in a type 'long' argument. */
|
|
easy_setopt(curl, CURLOPT_INFILESIZE_LARGE, (curl_off_t)file_info.st_size);
|
|
|
|
multi_init(multi);
|
|
|
|
multi_add_handle(multi, curl);
|
|
|
|
for(;;) {
|
|
struct timeval interval;
|
|
fd_set rd, wr, exc;
|
|
int maxfd = -99;
|
|
|
|
interval.tv_sec = 1;
|
|
interval.tv_usec = 0;
|
|
|
|
multi_perform(multi, &running);
|
|
|
|
abort_on_test_timeout();
|
|
|
|
if(!running)
|
|
break; /* done */
|
|
|
|
FD_ZERO(&rd);
|
|
FD_ZERO(&wr);
|
|
FD_ZERO(&exc);
|
|
|
|
multi_fdset(multi, &rd, &wr, &exc, &maxfd);
|
|
|
|
/* At this point, maxfd is guaranteed to be greater or equal than -1. */
|
|
|
|
select_test(maxfd + 1, &rd, &wr, &exc, &interval);
|
|
|
|
abort_on_test_timeout();
|
|
}
|
|
|
|
test_cleanup:
|
|
|
|
if(testnum == 529) {
|
|
/* proper cleanup sequence - type PA */
|
|
curl_multi_remove_handle(multi, curl);
|
|
curl_multi_cleanup(multi);
|
|
curl_easy_cleanup(curl);
|
|
curl_global_cleanup();
|
|
}
|
|
else { /* testnum == 525 */
|
|
/* proper cleanup sequence - type PB */
|
|
curl_multi_remove_handle(multi, curl);
|
|
curl_easy_cleanup(curl);
|
|
curl_multi_cleanup(multi);
|
|
curl_global_cleanup();
|
|
}
|
|
|
|
/* close the local file */
|
|
curlx_fclose(hd_src);
|
|
|
|
return result;
|
|
}
|