mirror of
https://github.com/open-goal/jak-project
synced 2026-09-10 20:29:51 -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)
223 lines
6.1 KiB
C
Vendored
Generated
223 lines
6.1 KiB
C
Vendored
Generated
/*
|
|
* Copyright (C) 1996-2022 Internet Software Consortium.
|
|
*
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
|
|
* DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
|
|
* INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
|
|
* INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
|
|
* FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
|
|
* NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
|
|
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*
|
|
* SPDX-License-Identifier: ISC
|
|
*/
|
|
#include "curl_setup.h"
|
|
|
|
#ifndef HAVE_INET_NTOP
|
|
|
|
#ifdef HAVE_SYS_PARAM_H
|
|
#include <sys/param.h>
|
|
#endif
|
|
#ifdef HAVE_NETINET_IN_H
|
|
#include <netinet/in.h>
|
|
#endif
|
|
#ifdef HAVE_ARPA_INET_H
|
|
#include <arpa/inet.h>
|
|
#endif
|
|
|
|
#include "curlx/inet_ntop.h"
|
|
#include "curlx/snprintf.h"
|
|
#include "curlx/strcopy.h"
|
|
|
|
#define IN6ADDRSZ 16
|
|
/* #define INADDRSZ 4 */
|
|
#define INT16SZ 2
|
|
|
|
/*
|
|
* If USE_IPV6 is disabled, we still want to parse IPv6 addresses, so make
|
|
* sure we have _some_ value for AF_INET6 without polluting our fake value
|
|
* everywhere.
|
|
*/
|
|
#if !defined(USE_IPV6) && !defined(AF_INET6)
|
|
#define AF_INET6 (AF_INET + 1)
|
|
#endif
|
|
|
|
/*
|
|
* Format an IPv4 address, more or less like inet_ntop().
|
|
*
|
|
* Returns `dst' (as a const)
|
|
* Note:
|
|
* - uses no static variables
|
|
* - takes an unsigned char* not an in_addr as input
|
|
*/
|
|
static char *inet_ntop4(const unsigned char *src, char *dst, size_t size)
|
|
{
|
|
char tmp[sizeof("255.255.255.255")];
|
|
size_t len;
|
|
|
|
DEBUGASSERT(size >= 16);
|
|
|
|
/* this snprintf() does not overflow the buffer. */
|
|
SNPRINTF(tmp, sizeof(tmp), "%d.%d.%d.%d",
|
|
((int)((unsigned char)src[0])) & 0xff,
|
|
((int)((unsigned char)src[1])) & 0xff,
|
|
((int)((unsigned char)src[2])) & 0xff,
|
|
((int)((unsigned char)src[3])) & 0xff);
|
|
|
|
len = strlen(tmp);
|
|
if(len == 0 || len >= size) {
|
|
#ifdef USE_WINSOCK
|
|
errno = WSAEINVAL;
|
|
#else
|
|
errno = ENOSPC;
|
|
#endif
|
|
return NULL;
|
|
}
|
|
curlx_strcopy(dst, size, tmp, len);
|
|
return dst;
|
|
}
|
|
|
|
/*
|
|
* Convert IPv6 binary address into presentation (printable) format.
|
|
*/
|
|
static char *inet_ntop6(const unsigned char *src, char *dst, size_t size)
|
|
{
|
|
/*
|
|
* Note that int32_t and int16_t need only be "at least" large enough
|
|
* to contain a value of the specified size. On some systems, like
|
|
* Crays, there is no such thing as an integer variable with 16 bits.
|
|
* Keep this in mind if you think this function should have been coded
|
|
* to use pointer overlays. All the world's not a VAX.
|
|
*/
|
|
char tmp[sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255")];
|
|
char *tp;
|
|
struct {
|
|
int base;
|
|
int len;
|
|
} best, cur;
|
|
unsigned int words[IN6ADDRSZ / INT16SZ];
|
|
int i;
|
|
|
|
/* Preprocess:
|
|
* Copy the input (bytewise) array into a wordwise array.
|
|
* Find the longest run of 0x00's in src[] for :: shorthanding.
|
|
*/
|
|
memset(words, '\0', sizeof(words));
|
|
for(i = 0; i < IN6ADDRSZ; i++)
|
|
words[i / 2] |= ((unsigned int)src[i] << ((1 - (i % 2)) << 3));
|
|
|
|
best.base = -1;
|
|
cur.base = -1;
|
|
best.len = 0;
|
|
cur.len = 0;
|
|
|
|
for(i = 0; i < (IN6ADDRSZ / INT16SZ); i++) {
|
|
if(words[i] == 0) {
|
|
if(cur.base == -1) {
|
|
cur.base = i;
|
|
cur.len = 1;
|
|
}
|
|
else
|
|
cur.len++;
|
|
}
|
|
else if(cur.base != -1) {
|
|
if(best.base == -1 || cur.len > best.len)
|
|
best = cur;
|
|
cur.base = -1;
|
|
}
|
|
}
|
|
if((cur.base != -1) && (best.base == -1 || cur.len > best.len))
|
|
best = cur;
|
|
if(best.base != -1 && best.len < 2)
|
|
best.base = -1;
|
|
/* Format the result. */
|
|
tp = tmp;
|
|
for(i = 0; i < (IN6ADDRSZ / INT16SZ); i++) {
|
|
/* Are we inside the best run of 0x00's? */
|
|
if(best.base != -1 && i >= best.base && i < (best.base + best.len)) {
|
|
if(i == best.base)
|
|
*tp++ = ':';
|
|
continue;
|
|
}
|
|
|
|
/* Are we following an initial run of 0x00s or any real hex?
|
|
*/
|
|
if(i)
|
|
*tp++ = ':';
|
|
|
|
/* Is this address an encapsulated IPv4?
|
|
*/
|
|
if(i == 6 && best.base == 0 &&
|
|
(best.len == 6 || (best.len == 5 && words[5] == 0xffff))) {
|
|
if(!inet_ntop4(src + 12, tp, sizeof(tmp) - (tp - tmp))) {
|
|
return NULL;
|
|
}
|
|
tp += strlen(tp);
|
|
break;
|
|
}
|
|
else {
|
|
/* Lower-case digits. Cannot use the set from mprintf.c since this
|
|
needs to work as a curlx function */
|
|
static const unsigned char ldigits[] = "0123456789abcdef";
|
|
|
|
unsigned int w = words[i];
|
|
/* output lowercase 16-bit hex number but ignore leading zeroes */
|
|
if(w & 0xf000)
|
|
*tp++ = ldigits[(w & 0xf000) >> 12];
|
|
if(w & 0xff00)
|
|
*tp++ = ldigits[(w & 0x0f00) >> 8];
|
|
if(w & 0xfff0)
|
|
*tp++ = ldigits[(w & 0x00f0) >> 4];
|
|
*tp++ = ldigits[(w & 0x000f)];
|
|
}
|
|
}
|
|
|
|
/* Was it a trailing run of 0x00's?
|
|
*/
|
|
if(best.base != -1 && (best.base + best.len) == (IN6ADDRSZ / INT16SZ))
|
|
*tp++ = ':';
|
|
|
|
/* Check for overflow, copy, and we are done. */
|
|
if((size_t)(tp - tmp) >= size) {
|
|
#ifdef USE_WINSOCK
|
|
errno = WSAEINVAL;
|
|
#else
|
|
errno = ENOSPC;
|
|
#endif
|
|
return NULL;
|
|
}
|
|
|
|
curlx_strcopy(dst, size, tmp, tp - tmp);
|
|
return dst;
|
|
}
|
|
|
|
/*
|
|
* Convert a network format address to presentation format.
|
|
*
|
|
* Returns pointer to presentation format address (`buf').
|
|
* Returns NULL on error and errno set with the specific
|
|
* error, EAFNOSUPPORT or ENOSPC.
|
|
*
|
|
* On Windows we store the error in the thread errno, not in the Winsock error
|
|
* code. This is to avoid losing the actual last Winsock error. When this
|
|
* function returns NULL, check errno not SOCKERRNO.
|
|
*/
|
|
char *curlx_inet_ntop(int af, const void *src, char *buf, size_t size)
|
|
{
|
|
switch(af) {
|
|
case AF_INET:
|
|
return inet_ntop4((const unsigned char *)src, buf, size);
|
|
case AF_INET6:
|
|
return inet_ntop6((const unsigned char *)src, buf, size);
|
|
default:
|
|
errno = SOCKEAFNOSUPPORT;
|
|
return NULL;
|
|
}
|
|
}
|
|
#endif /* HAVE_INET_NTOP */
|