mirror of
https://github.com/open-goal/jak-project
synced 2026-08-20 06:16:35 -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)
215 lines
5.0 KiB
C
Vendored
Generated
215 lines
5.0 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 "curl_setup.h"
|
|
#include "curl_threads.h"
|
|
#include "curlx/timeval.h"
|
|
|
|
#ifdef USE_THREADS
|
|
|
|
#ifdef HAVE_THREADS_POSIX
|
|
|
|
struct Curl_actual_call {
|
|
unsigned int (*func)(void *);
|
|
void *arg;
|
|
};
|
|
|
|
static void *curl_thread_create_thunk(void *arg)
|
|
{
|
|
struct Curl_actual_call *ac = arg;
|
|
unsigned int (*func)(void *) = ac->func;
|
|
void *real_arg = ac->arg;
|
|
|
|
curlx_free(ac);
|
|
|
|
(*func)(real_arg);
|
|
|
|
return 0;
|
|
}
|
|
|
|
curl_thread_t Curl_thread_create(
|
|
CURL_THREAD_RETURN_T(CURL_STDCALL *func)(void *), void *arg)
|
|
{
|
|
curl_thread_t t = curlx_malloc(sizeof(pthread_t));
|
|
struct Curl_actual_call *ac = NULL;
|
|
int rc;
|
|
|
|
if(t)
|
|
ac = curlx_malloc(sizeof(struct Curl_actual_call));
|
|
if(!(ac && t))
|
|
goto err;
|
|
|
|
ac->func = func;
|
|
ac->arg = arg;
|
|
|
|
rc = pthread_create(t, NULL, curl_thread_create_thunk, ac);
|
|
if(rc) {
|
|
errno = rc;
|
|
goto err;
|
|
}
|
|
|
|
return t;
|
|
|
|
err:
|
|
curlx_free(t);
|
|
curlx_free(ac);
|
|
return curl_thread_t_null;
|
|
}
|
|
|
|
void Curl_thread_destroy(curl_thread_t *hnd)
|
|
{
|
|
if(*hnd != curl_thread_t_null) {
|
|
pthread_detach(**hnd);
|
|
curlx_free(*hnd);
|
|
*hnd = curl_thread_t_null;
|
|
}
|
|
}
|
|
|
|
int Curl_thread_join(curl_thread_t *hnd)
|
|
{
|
|
int ret = (pthread_join(**hnd, NULL) == 0);
|
|
|
|
curlx_free(*hnd);
|
|
*hnd = curl_thread_t_null;
|
|
|
|
return ret;
|
|
}
|
|
|
|
#elif defined(_WIN32)
|
|
|
|
curl_thread_t Curl_thread_create(
|
|
CURL_THREAD_RETURN_T(CURL_STDCALL *func)(void *), void *arg)
|
|
{
|
|
curl_thread_t t = CreateThread(NULL, 0, func, arg, 0, NULL);
|
|
if(!t) {
|
|
DWORD gle = GetLastError();
|
|
/* !checksrc! disable ERRNOVAR 1 */
|
|
errno = (gle == ERROR_ACCESS_DENIED ||
|
|
gle == ERROR_NOT_ENOUGH_MEMORY) ?
|
|
EACCES : EINVAL;
|
|
return curl_thread_t_null;
|
|
}
|
|
return t;
|
|
}
|
|
|
|
void Curl_thread_destroy(curl_thread_t *hnd)
|
|
{
|
|
if(*hnd != curl_thread_t_null) {
|
|
CloseHandle(*hnd);
|
|
*hnd = curl_thread_t_null;
|
|
}
|
|
}
|
|
|
|
int Curl_thread_join(curl_thread_t *hnd)
|
|
{
|
|
int ret = (WaitForSingleObjectEx(*hnd, INFINITE, FALSE) == WAIT_OBJECT_0);
|
|
|
|
Curl_thread_destroy(hnd);
|
|
|
|
return ret;
|
|
}
|
|
|
|
#else
|
|
#error neither HAVE_THREADS_POSIX nor _WIN32 defined
|
|
#endif
|
|
#endif /* USE_THREADS */
|
|
|
|
#ifdef USE_MUTEX
|
|
|
|
#ifdef HAVE_THREADS_POSIX
|
|
|
|
void Curl_cond_signal(pthread_cond_t *c)
|
|
{
|
|
/* return code defined as always 0 */
|
|
(void)pthread_cond_signal(c);
|
|
}
|
|
|
|
void Curl_cond_wait(pthread_cond_t *c, pthread_mutex_t *m)
|
|
{
|
|
/* return code defined as always 0 */
|
|
(void)pthread_cond_wait(c, m);
|
|
}
|
|
|
|
CURLcode Curl_cond_timedwait(pthread_cond_t *c, pthread_mutex_t *m,
|
|
uint32_t timeout_ms)
|
|
{
|
|
struct curltime now;
|
|
struct timespec ts;
|
|
timediff_t usec;
|
|
int rc;
|
|
|
|
/* POSIX expects an "absolute" time until the condition wait ends.
|
|
* We cannot use `curlx_now()` here that may run on some monotonic clock
|
|
* that will be most likely in the past, as far as POSIX abstime is
|
|
* concerned. */
|
|
#ifdef HAVE_GETTIMEOFDAY
|
|
struct timeval tv;
|
|
(void)gettimeofday(&tv, NULL);
|
|
now.tv_sec = tv.tv_sec;
|
|
now.tv_usec = (int)tv.tv_usec;
|
|
#else
|
|
now.tv_sec = time(NULL);
|
|
now.tv_usec = 0;
|
|
#endif
|
|
|
|
ts.tv_sec = now.tv_sec + (timeout_ms / 1000);
|
|
usec = now.tv_usec + ((timeout_ms % 1000) * 1000);
|
|
if(usec >= 1000000) {
|
|
++ts.tv_sec;
|
|
usec %= 1000000;
|
|
}
|
|
ts.tv_nsec = (long)usec * 1000;
|
|
|
|
rc = pthread_cond_timedwait(c, m, &ts);
|
|
if(rc == SOCKETIMEDOUT)
|
|
return CURLE_OPERATION_TIMEDOUT;
|
|
return rc ? CURLE_UNRECOVERABLE_POLL : CURLE_OK;
|
|
}
|
|
|
|
#elif defined(_WIN32)
|
|
|
|
void Curl_cond_signal(CONDITION_VARIABLE *c)
|
|
{
|
|
WakeConditionVariable(c);
|
|
}
|
|
|
|
void Curl_cond_wait(CONDITION_VARIABLE *c, CRITICAL_SECTION *m)
|
|
{
|
|
SleepConditionVariableCS(c, m, INFINITE);
|
|
}
|
|
|
|
CURLcode Curl_cond_timedwait(CONDITION_VARIABLE *c, CRITICAL_SECTION *m,
|
|
uint32_t timeout_ms)
|
|
{
|
|
if(!SleepConditionVariableCS(c, m, (DWORD)timeout_ms)) {
|
|
DWORD err = GetLastError();
|
|
return (err == ERROR_TIMEOUT) ?
|
|
CURLE_OPERATION_TIMEDOUT : CURLE_UNRECOVERABLE_POLL;
|
|
}
|
|
return CURLE_OK;
|
|
}
|
|
#else
|
|
#error neither HAVE_THREADS_POSIX nor _WIN32 defined
|
|
#endif
|
|
#endif /* USE_MUTEX */
|