mirror of
https://github.com/open-goal/jak-project
synced 2026-08-20 14:24:45 -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)
263 lines
7.2 KiB
C
Vendored
Generated
263 lines
7.2 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"
|
|
|
|
#ifdef HAVE_NETINET_IN_H
|
|
# include <netinet/in.h>
|
|
#endif
|
|
#ifdef HAVE_ARPA_INET_H
|
|
# include <arpa/inet.h>
|
|
#endif
|
|
#ifdef HAVE_NET_IF_H
|
|
# include <net/if.h>
|
|
#endif
|
|
#ifdef HAVE_SYS_IOCTL_H
|
|
# include <sys/ioctl.h>
|
|
#endif
|
|
#ifdef HAVE_NETDB_H
|
|
# include <netdb.h>
|
|
#endif
|
|
#ifdef HAVE_SYS_SOCKIO_H
|
|
# include <sys/sockio.h>
|
|
#endif
|
|
#ifdef HAVE_IFADDRS_H
|
|
# include <ifaddrs.h>
|
|
#endif
|
|
#ifdef HAVE_STROPTS_H
|
|
# include <stropts.h>
|
|
#endif
|
|
#ifdef __VMS
|
|
# include <inet.h>
|
|
#endif
|
|
|
|
#include "curlx/inet_ntop.h"
|
|
#include "if2ip.h"
|
|
|
|
/* ------------------------------------------------------------------ */
|
|
|
|
#ifdef USE_IPV6
|
|
/* Return the scope of the given address. */
|
|
unsigned int Curl_ipv6_scope(const struct sockaddr *sa)
|
|
{
|
|
if(sa->sa_family == AF_INET6) {
|
|
const struct sockaddr_in6 *sa6 =
|
|
(const struct sockaddr_in6 *)(const void *)sa;
|
|
const unsigned char *b = sa6->sin6_addr.s6_addr;
|
|
unsigned short w = (unsigned short)((b[0] << 8) | b[1]);
|
|
|
|
if((b[0] & 0xFE) == 0xFC) /* Handle ULAs */
|
|
return IPV6_SCOPE_UNIQUELOCAL;
|
|
switch(w & 0xFFC0) {
|
|
case 0xFE80:
|
|
return IPV6_SCOPE_LINKLOCAL;
|
|
case 0xFEC0:
|
|
return IPV6_SCOPE_SITELOCAL;
|
|
case 0x0000:
|
|
w = b[1] | b[2] | b[3] | b[4] | b[5] | b[6] | b[7] | b[8] | b[9] |
|
|
b[10] | b[11] | b[12] | b[13] | b[14];
|
|
if(w || b[15] != 0x01)
|
|
break;
|
|
return IPV6_SCOPE_NODELOCAL;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
return IPV6_SCOPE_GLOBAL;
|
|
}
|
|
#endif
|
|
|
|
#if !defined(CURL_DISABLE_BINDLOCAL) || !defined(CURL_DISABLE_FTP)
|
|
|
|
#ifdef HAVE_GETIFADDRS
|
|
|
|
if2ip_result_t Curl_if2ip(int af,
|
|
#ifdef USE_IPV6
|
|
unsigned int remote_scope,
|
|
unsigned int local_scope_id,
|
|
#endif
|
|
const char *interf,
|
|
char *buf, size_t buf_size)
|
|
{
|
|
struct ifaddrs *iface, *head;
|
|
if2ip_result_t res = IF2IP_NOT_FOUND;
|
|
|
|
#if defined(USE_IPV6) && !defined(HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID)
|
|
(void)local_scope_id;
|
|
#endif
|
|
|
|
if(getifaddrs(&head) >= 0) {
|
|
for(iface = head; iface; iface = iface->ifa_next) {
|
|
if(iface->ifa_addr) {
|
|
if(iface->ifa_addr->sa_family == af) {
|
|
if(curl_strequal(iface->ifa_name, interf)) {
|
|
void *addr;
|
|
const char *ip;
|
|
char scope[12] = "";
|
|
char ipstr[64];
|
|
#ifdef USE_IPV6
|
|
if(af == AF_INET6) {
|
|
#ifdef HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID
|
|
unsigned int scopeid = 0;
|
|
#endif
|
|
unsigned int ifscope = Curl_ipv6_scope(iface->ifa_addr);
|
|
|
|
if(ifscope != remote_scope) {
|
|
/* We are interested only in interface addresses whose scope
|
|
matches the remote address we want to connect to: global
|
|
for global, link-local for link-local, etc... */
|
|
if(res == IF2IP_NOT_FOUND)
|
|
res = IF2IP_AF_NOT_SUPPORTED;
|
|
continue;
|
|
}
|
|
|
|
addr =
|
|
&((struct sockaddr_in6 *)(void *)iface->ifa_addr)->sin6_addr;
|
|
#ifdef HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID
|
|
/* Include the scope of this interface as part of the address */
|
|
scopeid = ((struct sockaddr_in6 *)(void *)iface->ifa_addr)
|
|
->sin6_scope_id;
|
|
|
|
/* If given, scope id should match. */
|
|
if(local_scope_id && scopeid != local_scope_id) {
|
|
if(res == IF2IP_NOT_FOUND)
|
|
res = IF2IP_AF_NOT_SUPPORTED;
|
|
|
|
continue;
|
|
}
|
|
|
|
if(scopeid)
|
|
curl_msnprintf(scope, sizeof(scope), "%%%u", scopeid);
|
|
#endif
|
|
}
|
|
else
|
|
#endif
|
|
addr =
|
|
&((struct sockaddr_in *)(void *)iface->ifa_addr)->sin_addr;
|
|
res = IF2IP_FOUND;
|
|
ip = curlx_inet_ntop(af, addr, ipstr, sizeof(ipstr));
|
|
curl_msnprintf(buf, buf_size, "%s%s", ip, scope);
|
|
break;
|
|
}
|
|
}
|
|
else if((res == IF2IP_NOT_FOUND) &&
|
|
curl_strequal(iface->ifa_name, interf)) {
|
|
res = IF2IP_AF_NOT_SUPPORTED;
|
|
}
|
|
}
|
|
}
|
|
|
|
freeifaddrs(head);
|
|
}
|
|
|
|
return res;
|
|
}
|
|
|
|
#elif defined(HAVE_IOCTL_SIOCGIFADDR)
|
|
|
|
if2ip_result_t Curl_if2ip(int af,
|
|
#ifdef USE_IPV6
|
|
unsigned int remote_scope,
|
|
unsigned int local_scope_id,
|
|
#endif
|
|
const char *interf,
|
|
char *buf, size_t buf_size)
|
|
{
|
|
struct ifreq req;
|
|
struct in_addr in;
|
|
struct sockaddr_in *s;
|
|
curl_socket_t dummy;
|
|
size_t len;
|
|
const char *r;
|
|
|
|
#ifdef USE_IPV6
|
|
(void)remote_scope;
|
|
(void)local_scope_id;
|
|
#endif
|
|
|
|
if(!interf || (af != AF_INET))
|
|
return IF2IP_NOT_FOUND;
|
|
|
|
len = strlen(interf);
|
|
if(len >= sizeof(req.ifr_name))
|
|
return IF2IP_NOT_FOUND;
|
|
|
|
dummy = CURL_SOCKET(AF_INET, SOCK_STREAM, 0);
|
|
if(dummy == CURL_SOCKET_BAD)
|
|
return IF2IP_NOT_FOUND;
|
|
|
|
memset(&req, 0, sizeof(req));
|
|
memcpy(req.ifr_name, interf, len + 1);
|
|
req.ifr_addr.sa_family = AF_INET;
|
|
|
|
#if defined(CURL_HAVE_DIAG) && defined(_AIX)
|
|
/* Suppress warning inside system headers */
|
|
#pragma GCC diagnostic push
|
|
#pragma GCC diagnostic ignored "-Wshift-sign-overflow"
|
|
#endif
|
|
if(ioctl(dummy, SIOCGIFADDR, &req) < 0) {
|
|
#if defined(CURL_HAVE_DIAG) && defined(_AIX)
|
|
#pragma GCC diagnostic pop
|
|
#endif
|
|
sclose(dummy);
|
|
/* With SIOCGIFADDR, we cannot tell the difference between an interface
|
|
that does not exist and an interface that has no address of the
|
|
correct family. Assume the interface does not exist */
|
|
return IF2IP_NOT_FOUND;
|
|
}
|
|
|
|
s = (struct sockaddr_in *)(void *)&req.ifr_addr;
|
|
memcpy(&in, &s->sin_addr, sizeof(in));
|
|
r = curlx_inet_ntop(s->sin_family, &in, buf, buf_size);
|
|
|
|
sclose(dummy);
|
|
if(!r)
|
|
return IF2IP_NOT_FOUND;
|
|
return IF2IP_FOUND;
|
|
}
|
|
|
|
#else
|
|
|
|
if2ip_result_t Curl_if2ip(int af,
|
|
#ifdef USE_IPV6
|
|
unsigned int remote_scope,
|
|
unsigned int local_scope_id,
|
|
#endif
|
|
const char *interf,
|
|
char *buf, size_t buf_size)
|
|
{
|
|
(void)af;
|
|
#ifdef USE_IPV6
|
|
(void)remote_scope;
|
|
(void)local_scope_id;
|
|
#endif
|
|
(void)interf;
|
|
(void)buf;
|
|
(void)buf_size;
|
|
return IF2IP_NOT_FOUND;
|
|
}
|
|
|
|
#endif
|
|
|
|
#endif /* CURL_DISABLE_BINDLOCAL && CURL_DISABLE_FTP */
|