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)
235 lines
7.1 KiB
C
Vendored
Generated
235 lines
7.1 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"
|
|
|
|
#define MAX_EASY_HANDLES 3
|
|
|
|
static int ntlm_counter[MAX_EASY_HANDLES];
|
|
static CURL *ntlm_curls[MAX_EASY_HANDLES];
|
|
static curl_socket_t ntlm_sockets[MAX_EASY_HANDLES];
|
|
static CURLcode ntlmcb_res = CURLE_OK;
|
|
|
|
static size_t cb2032(char *ptr, size_t size, size_t nmemb, void *data)
|
|
{
|
|
ssize_t idx = ((CURL **)data) - ntlm_curls;
|
|
curl_socket_t sock;
|
|
long longdata;
|
|
CURLcode result;
|
|
const size_t failure = (size && nmemb) ? 0 : 1;
|
|
(void)ptr;
|
|
|
|
ntlm_counter[idx] += (int)(size * nmemb);
|
|
|
|
/* Get socket being used for this easy handle, otherwise CURL_SOCKET_BAD */
|
|
result = curl_easy_getinfo(ntlm_curls[idx], CURLINFO_LASTSOCKET, &longdata);
|
|
|
|
if(result != CURLE_OK) {
|
|
curl_mfprintf(stderr, "%s:%d curl_easy_getinfo() failed, "
|
|
"with code %d (%s)\n",
|
|
__FILE__, __LINE__, (int)result, curl_easy_strerror(result));
|
|
ntlmcb_res = TEST_ERR_MAJOR_BAD;
|
|
return failure;
|
|
}
|
|
if(longdata == -1L)
|
|
sock = CURL_SOCKET_BAD;
|
|
else
|
|
sock = (curl_socket_t)longdata;
|
|
|
|
if(sock != CURL_SOCKET_BAD) {
|
|
/* Track relationship between this easy handle and the socket. */
|
|
if(ntlm_sockets[idx] == CURL_SOCKET_BAD) {
|
|
/* An easy handle without previous socket, record the socket. */
|
|
ntlm_sockets[idx] = sock;
|
|
}
|
|
else if(sock != ntlm_sockets[idx]) {
|
|
/* An easy handle with a socket different to previously
|
|
tracked one, log and fail right away. Known bug #37. */
|
|
curl_mfprintf(stderr, "Handle %zd started on socket %" FMT_SOCKET_T
|
|
" and moved to %" FMT_SOCKET_T "\n",
|
|
idx, ntlm_sockets[idx], sock);
|
|
ntlmcb_res = TEST_ERR_MAJOR_BAD;
|
|
return failure;
|
|
}
|
|
}
|
|
return size * nmemb;
|
|
}
|
|
|
|
static CURLcode test_lib2032(const char *URL) /* libntlmconnect */
|
|
{
|
|
enum HandleState {
|
|
ReadyForNewHandle,
|
|
NeedSocketForNewHandle,
|
|
NoMoreHandles
|
|
};
|
|
|
|
CURLcode result = CURLE_OK;
|
|
CURLM *multi = NULL;
|
|
int running;
|
|
int i;
|
|
int num_handles = 0;
|
|
enum HandleState state = ReadyForNewHandle;
|
|
size_t urllen = strlen(URL) + 4 + 1;
|
|
char *full_url = curlx_malloc(urllen);
|
|
|
|
start_test_timing();
|
|
|
|
if(!full_url) {
|
|
curl_mfprintf(stderr, "Not enough memory for full URL\n");
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
|
|
for(i = 0; i < MAX_EASY_HANDLES; ++i) {
|
|
ntlm_curls[i] = NULL;
|
|
ntlm_sockets[i] = CURL_SOCKET_BAD;
|
|
}
|
|
|
|
res_global_init(CURL_GLOBAL_ALL);
|
|
if(result) {
|
|
curlx_free(full_url);
|
|
return result;
|
|
}
|
|
|
|
multi_init(multi);
|
|
|
|
for(;;) {
|
|
struct timeval interval;
|
|
fd_set fdread;
|
|
fd_set fdwrite;
|
|
fd_set fdexcep;
|
|
long timeout = -99;
|
|
int maxfd = -99;
|
|
bool found_new_socket = FALSE;
|
|
|
|
/* Start a new handle if we are not at the max */
|
|
if(state == ReadyForNewHandle) {
|
|
easy_init(ntlm_curls[num_handles]);
|
|
|
|
if(num_handles % 3 == 2) {
|
|
curl_msnprintf(full_url, urllen, "%s0200", URL);
|
|
easy_setopt(ntlm_curls[num_handles], CURLOPT_HTTPAUTH, CURLAUTH_NTLM);
|
|
}
|
|
else {
|
|
curl_msnprintf(full_url, urllen, "%s0100", URL);
|
|
easy_setopt(ntlm_curls[num_handles], CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
|
|
}
|
|
easy_setopt(ntlm_curls[num_handles], CURLOPT_FRESH_CONNECT, 1L);
|
|
easy_setopt(ntlm_curls[num_handles], CURLOPT_URL, full_url);
|
|
easy_setopt(ntlm_curls[num_handles], CURLOPT_VERBOSE, 1L);
|
|
easy_setopt(ntlm_curls[num_handles], CURLOPT_HTTPGET, 1L);
|
|
easy_setopt(ntlm_curls[num_handles], CURLOPT_USERPWD,
|
|
"testuser:testpass");
|
|
easy_setopt(ntlm_curls[num_handles], CURLOPT_WRITEFUNCTION, cb2032);
|
|
easy_setopt(ntlm_curls[num_handles], CURLOPT_WRITEDATA,
|
|
(void *)(ntlm_curls + num_handles));
|
|
easy_setopt(ntlm_curls[num_handles], CURLOPT_HEADER, 1L);
|
|
|
|
multi_add_handle(multi, ntlm_curls[num_handles]);
|
|
num_handles += 1;
|
|
state = NeedSocketForNewHandle;
|
|
result = ntlmcb_res;
|
|
}
|
|
|
|
multi_perform(multi, &running);
|
|
|
|
curl_mfprintf(stderr, "%s:%d running %d state %d\n",
|
|
__FILE__, __LINE__, running, (int)state);
|
|
|
|
abort_on_test_timeout();
|
|
|
|
if(!running && state == NoMoreHandles)
|
|
break; /* done */
|
|
|
|
FD_ZERO(&fdread);
|
|
FD_ZERO(&fdwrite);
|
|
FD_ZERO(&fdexcep);
|
|
|
|
multi_fdset(multi, &fdread, &fdwrite, &fdexcep, &maxfd);
|
|
|
|
/* At this point, maxfd is guaranteed to be greater or equal than -1. */
|
|
|
|
if(state == NeedSocketForNewHandle) {
|
|
if(maxfd != -1 && !found_new_socket) {
|
|
curl_mfprintf(stderr,
|
|
"Warning: socket did not open immediately for new "
|
|
"handle (trying again)\n");
|
|
continue;
|
|
}
|
|
state =
|
|
num_handles < MAX_EASY_HANDLES ? ReadyForNewHandle : NoMoreHandles;
|
|
curl_mfprintf(stderr, "%s:%d new state %d\n",
|
|
__FILE__, __LINE__, (int)state);
|
|
}
|
|
|
|
multi_timeout(multi, &timeout);
|
|
|
|
/* At this point, timeout is guaranteed to be greater or equal than -1. */
|
|
|
|
curl_mfprintf(stderr, "%s:%d num_handles %d timeout %ld running %d\n",
|
|
__FILE__, __LINE__, num_handles, timeout, running);
|
|
|
|
if(timeout != -1L) {
|
|
int itimeout;
|
|
#if LONG_MAX > INT_MAX
|
|
itimeout = (timeout > (long)INT_MAX) ? INT_MAX : (int)timeout;
|
|
#else
|
|
itimeout = (int)timeout;
|
|
#endif
|
|
interval.tv_sec = itimeout / 1000;
|
|
interval.tv_usec = (itimeout % 1000) * 1000;
|
|
}
|
|
else {
|
|
interval.tv_sec = 0;
|
|
interval.tv_usec = 5000;
|
|
|
|
/* if there is no timeout and we get here on the last handle, we may
|
|
already have read the last part of the stream so waiting makes no
|
|
sense */
|
|
if(!running && num_handles == MAX_EASY_HANDLES) {
|
|
break;
|
|
}
|
|
}
|
|
|
|
select_test(maxfd + 1, &fdread, &fdwrite, &fdexcep, &interval);
|
|
|
|
abort_on_test_timeout();
|
|
}
|
|
|
|
test_cleanup:
|
|
|
|
/* proper cleanup sequence - type PB */
|
|
|
|
for(i = 0; i < MAX_EASY_HANDLES; i++) {
|
|
curl_mprintf("Data connection %d: %d\n", i, ntlm_counter[i]);
|
|
curl_multi_remove_handle(multi, ntlm_curls[i]);
|
|
curl_easy_cleanup(ntlm_curls[i]);
|
|
}
|
|
|
|
curl_multi_cleanup(multi);
|
|
curl_global_cleanup();
|
|
|
|
curlx_free(full_url);
|
|
|
|
return result;
|
|
}
|