mirror of
https://github.com/open-goal/jak-project
synced 2026-08-06 09:54:10 -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)
155 lines
6.0 KiB
C
Vendored
Generated
155 lines
6.0 KiB
C
Vendored
Generated
#ifndef HEADER_CURL_CF_SOCKET_H
|
|
#define HEADER_CURL_CF_SOCKET_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* 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"
|
|
|
|
struct Curl_addrinfo;
|
|
struct Curl_cfilter;
|
|
struct Curl_easy;
|
|
struct connectdata;
|
|
struct Curl_sockaddr_ex;
|
|
struct ip_quadruple;
|
|
|
|
#define curl_sa_addr addr.sa
|
|
#define curl_sa_addrbuf addr.buf
|
|
|
|
/*
|
|
* Parse interface option, and return the interface name and the host part.
|
|
*/
|
|
CURLcode Curl_parse_interface(const char *input,
|
|
char **dev, char **iface, char **host);
|
|
|
|
CURLcode Curl_socket_addr_from_ai(struct Curl_sockaddr_ex *addr,
|
|
const struct Curl_addrinfo *ai,
|
|
uint8_t transport);
|
|
|
|
/*
|
|
* Create a socket based on info from 'conn' and 'ai'.
|
|
*
|
|
* Fill in 'addr' and 'sockfd' accordingly if OK is returned. If the open
|
|
* socket callback is set, used that!
|
|
*
|
|
*/
|
|
CURLcode Curl_socket_open(struct Curl_easy *data,
|
|
const struct Curl_addrinfo *ai,
|
|
struct Curl_sockaddr_ex *addr,
|
|
uint8_t transport,
|
|
curl_socket_t *sockfd);
|
|
|
|
#ifdef USE_SO_NOSIGPIPE
|
|
/* Set SO_NOSIGPIPE on socket, return < 0 on error. */
|
|
int Curl_sock_nosigpipe(curl_socket_t sockfd);
|
|
#endif
|
|
|
|
int Curl_socket_close(struct Curl_easy *data, struct connectdata *conn,
|
|
curl_socket_t sock);
|
|
|
|
/**
|
|
* Creates a cfilter that opens a TCP socket to the given address
|
|
* when calling its `connect` implementation.
|
|
* The filter will not touch any connection/data flags and can be
|
|
* used in happy eyeballing. Once selected for use, its `_active()`
|
|
* method needs to be called.
|
|
*/
|
|
CURLcode Curl_cf_tcp_create(struct Curl_cfilter **pcf,
|
|
struct Curl_easy *data,
|
|
struct Curl_peer *origin,
|
|
struct Curl_peer *peer,
|
|
uint8_t transport_peer,
|
|
struct connectdata *conn,
|
|
struct Curl_sockaddr_ex *addr,
|
|
struct Curl_peer *tunnel_peer,
|
|
uint8_t tunnel_transport);
|
|
|
|
/**
|
|
* Creates a cfilter that opens a UDP socket to the given address
|
|
* when calling its `connect` implementation.
|
|
* The filter will not touch any connection/data flags and can be
|
|
* used in happy eyeballing. Once selected for use, its `_active()`
|
|
* method needs to be called.
|
|
*/
|
|
CURLcode Curl_cf_udp_create(struct Curl_cfilter **pcf,
|
|
struct Curl_easy *data,
|
|
struct Curl_peer *origin,
|
|
struct Curl_peer *peer,
|
|
uint8_t transport_peer,
|
|
struct connectdata *conn,
|
|
struct Curl_sockaddr_ex *addr,
|
|
struct Curl_peer *tunnel_peer,
|
|
uint8_t tunnel_transport);
|
|
|
|
/**
|
|
* Creates a cfilter that opens a UNIX socket to the given address
|
|
* when calling its `connect` implementation.
|
|
* The filter will not touch any connection/data flags and can be
|
|
* used in happy eyeballing. Once selected for use, its `_active()`
|
|
* method needs to be called.
|
|
*/
|
|
CURLcode Curl_cf_unix_create(struct Curl_cfilter **pcf,
|
|
struct Curl_easy *data,
|
|
struct Curl_peer *origin,
|
|
struct Curl_peer *peer,
|
|
uint8_t transport_peer,
|
|
struct connectdata *conn,
|
|
struct Curl_sockaddr_ex *addr,
|
|
struct Curl_peer *tunnel_peer,
|
|
uint8_t tunnel_transport);
|
|
|
|
/**
|
|
* Creates a cfilter that keeps a listening socket.
|
|
*/
|
|
CURLcode Curl_conn_tcp_listen_set(struct Curl_easy *data,
|
|
struct connectdata *conn,
|
|
int sockindex,
|
|
curl_socket_t *s);
|
|
|
|
/**
|
|
* Return TRUE iff the last filter at `sockindex` was set via
|
|
* Curl_conn_tcp_listen_set().
|
|
*/
|
|
bool Curl_conn_is_tcp_listen(struct Curl_easy *data,
|
|
int sockindex);
|
|
|
|
/**
|
|
* Peek at the socket and remote ip/port the socket filter is using.
|
|
* The filter owns all returned values.
|
|
* @param psock pointer to hold socket descriptor or NULL
|
|
* @param paddr pointer to hold addr reference or NULL
|
|
* @param pip pointer to get IP quadruple or NULL
|
|
* Returns error if the filter is of invalid type.
|
|
*/
|
|
CURLcode Curl_cf_socket_peek(struct Curl_cfilter *cf,
|
|
struct Curl_easy *data,
|
|
curl_socket_t *psock,
|
|
const struct Curl_sockaddr_ex **paddr,
|
|
struct ip_quadruple *pip) WARN_UNUSED_RESULT;
|
|
|
|
extern struct Curl_cftype Curl_cft_tcp;
|
|
extern struct Curl_cftype Curl_cft_udp;
|
|
extern struct Curl_cftype Curl_cft_unix;
|
|
extern struct Curl_cftype Curl_cft_tcp_accept;
|
|
|
|
#endif /* HEADER_CURL_CF_SOCKET_H */
|