mirror of
https://github.com/open-goal/jak-project
synced 2026-08-20 22:35:07 -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)
206 lines
4.9 KiB
C
Vendored
Generated
206 lines
4.9 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"
|
|
|
|
#ifdef HAVE_THREADS_POSIX
|
|
|
|
#define CONN_NUM 3
|
|
#define TIME_BETWEEN_START_SECS 2
|
|
|
|
static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
|
|
static CURL *pending_curls[CONN_NUM];
|
|
static int pending_num = 0;
|
|
static CURLcode t1565_test_failure = CURLE_OK;
|
|
|
|
static CURLM *testmulti = NULL;
|
|
static const char *t1565_url;
|
|
|
|
static void *t1565_run_thread(void *ptr)
|
|
{
|
|
CURL *curl = NULL;
|
|
CURLcode result = CURLE_OK;
|
|
int i;
|
|
|
|
(void)ptr;
|
|
|
|
for(i = 0; i < CONN_NUM; i++) {
|
|
curlx_wait_ms(TIME_BETWEEN_START_SECS * 1000);
|
|
|
|
easy_init(curl);
|
|
|
|
easy_setopt(curl, CURLOPT_URL, t1565_url);
|
|
easy_setopt(curl, CURLOPT_VERBOSE, 0L);
|
|
|
|
pthread_mutex_lock(&lock);
|
|
|
|
if(t1565_test_failure) {
|
|
pthread_mutex_unlock(&lock);
|
|
goto test_cleanup;
|
|
}
|
|
|
|
pending_curls[pending_num] = curl;
|
|
pending_num++;
|
|
curl = NULL;
|
|
|
|
pthread_mutex_unlock(&lock);
|
|
|
|
res_multi_wakeup(testmulti);
|
|
}
|
|
|
|
test_cleanup:
|
|
|
|
curl_easy_cleanup(curl);
|
|
|
|
pthread_mutex_lock(&lock);
|
|
|
|
if(!t1565_test_failure)
|
|
t1565_test_failure = result;
|
|
|
|
pthread_mutex_unlock(&lock);
|
|
|
|
return NULL;
|
|
}
|
|
|
|
static CURLcode test_lib1565(const char *URL)
|
|
{
|
|
int still_running;
|
|
int num;
|
|
int i;
|
|
int rc;
|
|
CURLcode result = CURLE_OK;
|
|
CURL *started_curls[CONN_NUM];
|
|
int started_num = 0;
|
|
int finished_num = 0;
|
|
pthread_t tid = 0;
|
|
bool tid_valid = FALSE;
|
|
struct CURLMsg *message;
|
|
|
|
start_test_timing();
|
|
|
|
global_init(CURL_GLOBAL_ALL);
|
|
|
|
multi_init(testmulti);
|
|
|
|
t1565_url = URL;
|
|
|
|
rc = pthread_create(&tid, NULL, t1565_run_thread, NULL);
|
|
if(!rc)
|
|
tid_valid = TRUE;
|
|
else {
|
|
curl_mfprintf(stderr, "%s:%d Could not create thread, errno %d\n",
|
|
__FILE__, __LINE__, rc);
|
|
result = CURLE_FAILED_INIT;
|
|
goto test_cleanup;
|
|
}
|
|
|
|
while(1) {
|
|
multi_perform(testmulti, &still_running);
|
|
|
|
abort_on_test_timeout();
|
|
|
|
while((message = curl_multi_info_read(testmulti, &num))) {
|
|
if(message->msg == CURLMSG_DONE) {
|
|
result = message->data.result;
|
|
if(result)
|
|
goto test_cleanup;
|
|
multi_remove_handle(testmulti, message->easy_handle);
|
|
finished_num++;
|
|
}
|
|
else {
|
|
curl_mfprintf(stderr,
|
|
"%s:%d Got an unexpected message from curl: %d\n",
|
|
__FILE__, __LINE__, (int)message->msg);
|
|
result = TEST_ERR_MAJOR_BAD;
|
|
goto test_cleanup;
|
|
}
|
|
|
|
abort_on_test_timeout();
|
|
}
|
|
|
|
if(CONN_NUM == finished_num)
|
|
break;
|
|
|
|
multi_poll(testmulti, NULL, 0, TEST_HANG_TIMEOUT, &num);
|
|
|
|
abort_on_test_timeout();
|
|
|
|
pthread_mutex_lock(&lock);
|
|
|
|
while(pending_num > 0) {
|
|
res_multi_add_handle(testmulti, pending_curls[pending_num - 1]);
|
|
if(result) {
|
|
pthread_mutex_unlock(&lock);
|
|
goto test_cleanup;
|
|
}
|
|
|
|
started_curls[started_num] = pending_curls[pending_num - 1];
|
|
started_num++;
|
|
pending_num--;
|
|
}
|
|
|
|
pthread_mutex_unlock(&lock);
|
|
|
|
abort_on_test_timeout();
|
|
}
|
|
|
|
if(CONN_NUM != started_num) {
|
|
curl_mfprintf(stderr, "%s:%d Not all connections started: %d of %d\n",
|
|
__FILE__, __LINE__, started_num, CONN_NUM);
|
|
goto test_cleanup;
|
|
}
|
|
|
|
if(CONN_NUM != finished_num) {
|
|
curl_mfprintf(stderr, "%s:%d Not all connections finished: %d of %d\n",
|
|
__FILE__, __LINE__, started_num, CONN_NUM);
|
|
goto test_cleanup;
|
|
}
|
|
|
|
test_cleanup:
|
|
|
|
pthread_mutex_lock(&lock);
|
|
if(!t1565_test_failure)
|
|
t1565_test_failure = result;
|
|
pthread_mutex_unlock(&lock);
|
|
|
|
if(tid_valid)
|
|
pthread_join(tid, NULL);
|
|
|
|
curl_multi_cleanup(testmulti);
|
|
for(i = 0; i < pending_num; i++)
|
|
curl_easy_cleanup(pending_curls[i]);
|
|
for(i = 0; i < started_num; i++)
|
|
curl_easy_cleanup(started_curls[i]);
|
|
curl_global_cleanup();
|
|
|
|
return t1565_test_failure;
|
|
}
|
|
|
|
#else /* without pthread, this test does not work */
|
|
static CURLcode test_lib1565(const char *URL)
|
|
{
|
|
(void)URL;
|
|
return CURLE_OK;
|
|
}
|
|
#endif
|