mirror of
https://github.com/open-goal/jak-project
synced 2026-09-01 17:59:55 -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)
203 lines
5.4 KiB
C
Vendored
Generated
203 lines
5.4 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 "fake_addrinfo.h"
|
|
|
|
#ifdef USE_FAKE_GETADDRINFO
|
|
|
|
#include <ares.h>
|
|
|
|
void r_freeaddrinfo(struct addrinfo *cahead)
|
|
{
|
|
struct addrinfo *canext;
|
|
struct addrinfo *ca;
|
|
|
|
for(ca = cahead; ca; ca = canext) {
|
|
canext = ca->ai_next;
|
|
curlx_free(ca);
|
|
}
|
|
}
|
|
|
|
struct context {
|
|
struct ares_addrinfo *addr;
|
|
};
|
|
|
|
static void async_addrinfo_cb(void *userp, int status, int timeouts,
|
|
struct ares_addrinfo *addr)
|
|
{
|
|
struct context *ctx = (struct context *)userp;
|
|
(void)timeouts;
|
|
if(ARES_SUCCESS == status) {
|
|
ctx->addr = addr;
|
|
}
|
|
}
|
|
|
|
/* convert the c-ares version into the "native" version */
|
|
static struct addrinfo *mk_getaddrinfo(const struct ares_addrinfo *aihead)
|
|
{
|
|
const struct ares_addrinfo_node *ai;
|
|
struct addrinfo *ca;
|
|
struct addrinfo *cafirst = NULL;
|
|
struct addrinfo *calast = NULL;
|
|
const char *name = aihead->name;
|
|
|
|
/* traverse the addrinfo list */
|
|
for(ai = aihead->nodes; ai; ai = ai->ai_next) {
|
|
size_t ss_size;
|
|
size_t namelen = name ? strlen(name) + 1 : 0;
|
|
/* ignore elements with unsupported address family,
|
|
settle family-specific sockaddr structure size. */
|
|
if(ai->ai_family == AF_INET)
|
|
ss_size = sizeof(struct sockaddr_in);
|
|
else if(ai->ai_family == AF_INET6)
|
|
ss_size = sizeof(struct sockaddr_in6);
|
|
else
|
|
continue;
|
|
|
|
/* ignore elements without required address info */
|
|
if(!ai->ai_addr || !(ai->ai_addrlen > 0))
|
|
continue;
|
|
|
|
/* ignore elements with bogus address size */
|
|
if((size_t)ai->ai_addrlen < ss_size)
|
|
continue;
|
|
|
|
ca = curlx_malloc(sizeof(struct addrinfo) + ss_size + namelen);
|
|
if(!ca) {
|
|
r_freeaddrinfo(cafirst);
|
|
return NULL;
|
|
}
|
|
|
|
/* copy each structure member individually, member ordering,
|
|
size, or padding might be different for each platform. */
|
|
|
|
ca->ai_flags = ai->ai_flags;
|
|
ca->ai_family = ai->ai_family;
|
|
ca->ai_socktype = ai->ai_socktype;
|
|
ca->ai_protocol = ai->ai_protocol;
|
|
ca->ai_addrlen = (curl_socklen_t)ss_size;
|
|
ca->ai_addr = NULL;
|
|
ca->ai_canonname = NULL;
|
|
ca->ai_next = NULL;
|
|
|
|
ca->ai_addr = (void *)((char *)ca + sizeof(struct addrinfo));
|
|
memcpy(ca->ai_addr, ai->ai_addr, ss_size);
|
|
|
|
if(namelen) {
|
|
ca->ai_canonname = (void *)((char *)ca->ai_addr + ss_size);
|
|
memcpy(ca->ai_canonname, name, namelen);
|
|
|
|
/* the name is only pointed to by the first entry in the "real"
|
|
addrinfo chain, so stop now */
|
|
name = NULL;
|
|
}
|
|
|
|
/* if the return list is empty, this becomes the first element */
|
|
if(!cafirst)
|
|
cafirst = ca;
|
|
|
|
/* add this element last in the return list */
|
|
if(calast)
|
|
calast->ai_next = ca;
|
|
calast = ca;
|
|
}
|
|
|
|
return cafirst;
|
|
}
|
|
|
|
/*
|
|
RETURN VALUE
|
|
|
|
getaddrinfo() returns 0 if it succeeds, or one of the following nonzero
|
|
error codes:
|
|
|
|
...
|
|
*/
|
|
int r_getaddrinfo(const char *node,
|
|
const char *service,
|
|
const struct addrinfo *hints,
|
|
struct addrinfo **res)
|
|
{
|
|
int status;
|
|
struct context ctx;
|
|
struct ares_options options;
|
|
int optmask = 0;
|
|
struct ares_addrinfo_hints ahints;
|
|
ares_channel channel;
|
|
int rc = 0;
|
|
|
|
memset(&options, 0, sizeof(options));
|
|
optmask |= ARES_OPT_EVENT_THREAD;
|
|
options.evsys = ARES_EVSYS_DEFAULT;
|
|
|
|
memset(&ahints, 0, sizeof(ahints));
|
|
memset(&ctx, 0, sizeof(ctx));
|
|
|
|
if(hints) {
|
|
ahints.ai_flags = hints->ai_flags;
|
|
ahints.ai_family = hints->ai_family;
|
|
ahints.ai_socktype = hints->ai_socktype;
|
|
ahints.ai_protocol = hints->ai_protocol;
|
|
}
|
|
|
|
status = ares_init_options(&channel, &options, optmask);
|
|
if(status)
|
|
return EAI_MEMORY; /* major problem */
|
|
|
|
else {
|
|
const char *env = getenv("CURL_DNS_SERVER");
|
|
if(env) {
|
|
rc = ares_set_servers_ports_csv(channel, env);
|
|
if(rc) {
|
|
curl_mfprintf(stderr, "ares_set_servers_ports_csv failed: %d", rc);
|
|
/* Cleanup */
|
|
ares_destroy(channel);
|
|
return EAI_MEMORY; /* we cannot run */
|
|
}
|
|
}
|
|
}
|
|
|
|
ares_getaddrinfo(channel, node, service, &ahints, async_addrinfo_cb, &ctx);
|
|
|
|
/* Wait until no more requests are left to be processed */
|
|
ares_queue_wait_empty(channel, -1);
|
|
|
|
if(ctx.addr) {
|
|
/* convert the c-ares version */
|
|
*res = mk_getaddrinfo(ctx.addr);
|
|
/* free the old */
|
|
ares_freeaddrinfo(ctx.addr);
|
|
}
|
|
else
|
|
rc = EAI_NONAME; /* got nothing */
|
|
|
|
/* Cleanup */
|
|
ares_destroy(channel);
|
|
|
|
return rc;
|
|
}
|
|
|
|
#endif /* USE_FAKE_GETADDRINFO */
|