mirror of
https://github.com/open-goal/jak-project
synced 2026-08-20 06:16:35 -04:00
Alexander J. Semenuk
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)
188 lines
7.1 KiB
C
Vendored
Generated
188 lines
7.1 KiB
C
Vendored
Generated
#ifndef HEADER_CURL_HOSTIP_H
|
|
#define HEADER_CURL_HOSTIP_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"
|
|
|
|
#include "hash.h"
|
|
#include "curlx/timeval.h" /* for curltime, timediff_t */
|
|
|
|
/* Allocate enough memory to hold the full name information structs and
|
|
* everything. OSF1 is known to require at least 8872 bytes. The buffer
|
|
* required for storing all possible aliases and IP numbers is according to
|
|
* Stevens' Unix Network Programming 2nd edition, p. 304: 8192 bytes!
|
|
*/
|
|
#define CURL_HOSTENT_SIZE 9000
|
|
|
|
#define CURL_TIMEOUT_RESOLVE_MS (300 * 1000)
|
|
|
|
struct addrinfo;
|
|
struct hostent;
|
|
struct Curl_easy;
|
|
struct connectdata;
|
|
struct easy_pollset;
|
|
struct Curl_https_rrinfo;
|
|
struct Curl_multi;
|
|
struct Curl_dns_entry;
|
|
struct Curl_peer;
|
|
|
|
/* DNS query types */
|
|
#define CURL_DNSQ_A (1U << 0)
|
|
#define CURL_DNSQ_AAAA (1U << 1)
|
|
#define CURL_DNSQ_HTTPS (1U << 2)
|
|
|
|
#define CURL_DNSQ_ALL (CURL_DNSQ_A | CURL_DNSQ_AAAA | CURL_DNSQ_HTTPS)
|
|
#define CURL_DNSQ_IP(x) (uint8_t)((x)&(CURL_DNSQ_A | CURL_DNSQ_AAAA))
|
|
|
|
#ifdef CURLVERBOSE
|
|
const char *Curl_resolv_query_str(uint8_t dns_queries);
|
|
#endif
|
|
|
|
/* Return CURL_DNSQ_* bits for the transfer and ip_version. */
|
|
uint8_t Curl_resolv_dns_queries(struct Curl_easy *data, uint8_t ip_version);
|
|
|
|
enum alpnid {
|
|
ALPN_none = 0,
|
|
ALPN_h1 = CURLALTSVC_H1,
|
|
ALPN_h2 = CURLALTSVC_H2,
|
|
ALPN_h3 = CURLALTSVC_H3
|
|
};
|
|
|
|
bool Curl_host_is_ipnum(const char *hostname);
|
|
|
|
#ifdef USE_IPV6
|
|
/* probe if it seems to work */
|
|
CURLcode Curl_probeipv6(struct Curl_multi *multi);
|
|
#else
|
|
#define Curl_probeipv6(x) CURLE_OK
|
|
#endif
|
|
|
|
/* IPv4 thread-safe resolve function used for synch and asynch builds */
|
|
struct Curl_addrinfo *Curl_ipv4_resolve_r(const char *hostname, uint16_t port);
|
|
|
|
/*
|
|
* Curl_printable_address() returns a printable version of the 1st address
|
|
* given in the 'ai' argument. The result will be stored in the buf that is
|
|
* bufsize bytes big.
|
|
*/
|
|
void Curl_printable_address(const struct Curl_addrinfo *ai,
|
|
char *buf, size_t bufsize);
|
|
|
|
/* Start DNS resolving for the given parameters. Returns
|
|
* - CURLE_OK: `*pdns` is the resolved DNS entry (needs to be unlinked).
|
|
* `*presolv_id` is 0.
|
|
* - CURLE_AGAIN: resolve is asynchronous and not finished yet.
|
|
* `presolv_id` is the identifier for querying results later.
|
|
* - other: the operation failed, `*pdns` is NULL, `*presolv_id` is 0.
|
|
*/
|
|
CURLcode Curl_resolv(struct Curl_easy *data,
|
|
struct Curl_peer *peer,
|
|
uint8_t dns_queries,
|
|
uint8_t transport,
|
|
bool for_proxy,
|
|
timediff_t timeout_ms,
|
|
uint32_t *presolv_id,
|
|
struct Curl_dns_entry **pdns);
|
|
|
|
CURLcode Curl_resolv_blocking(struct Curl_easy *data,
|
|
uint8_t dns_queries,
|
|
const char *hostname,
|
|
uint16_t port,
|
|
uint8_t transport,
|
|
struct Curl_dns_entry **pdns);
|
|
|
|
/* Announce start of a resolve operation to application callback,
|
|
* passing the resolver implementation (maybe NULL). */
|
|
CURLcode Curl_resolv_announce_start(struct Curl_easy *data,
|
|
void *resolver);
|
|
|
|
#ifdef USE_CURL_ASYNC
|
|
|
|
CURLcode Curl_resolv_pollset(struct Curl_easy *data,
|
|
struct easy_pollset *ps);
|
|
|
|
/* Get the `async` struct for the given `resolv_id`, if it exists. */
|
|
struct Curl_resolv_async *Curl_async_get(struct Curl_easy *data,
|
|
uint32_t resolv_id);
|
|
|
|
/* Shut down all resolves of the given easy handle. */
|
|
void Curl_resolv_shutdown_all(struct Curl_easy *data);
|
|
|
|
/* Destroy all resolve resources of the given easy handle. */
|
|
void Curl_resolv_destroy_all(struct Curl_easy *data);
|
|
|
|
CURLcode Curl_resolv_take_result(struct Curl_easy *data, uint32_t resolv_id,
|
|
struct Curl_dns_entry **pdns);
|
|
|
|
void Curl_resolv_destroy(struct Curl_easy *data, uint32_t resolv_id);
|
|
|
|
/* How much time has gone by since start of resolve.
|
|
* Returns CURL_TIMEOUT_RESOLVE_MS if `resolv_id` is no longer valid. */
|
|
timediff_t Curl_resolv_elapsed_ms(struct Curl_easy *data,
|
|
uint32_t resolv_id);
|
|
|
|
/* Return TRUE if `resolv_id` has answers (positive or negative) to
|
|
* all queries in `dns_queries`.
|
|
* Queries not requested are considered answered. */
|
|
bool Curl_resolv_has_answers(struct Curl_easy *data,
|
|
uint32_t resolv_id, uint8_t dns_queries);
|
|
|
|
const struct Curl_addrinfo *Curl_resolv_get_ai(struct Curl_easy *data,
|
|
uint32_t resolv_id,
|
|
int ai_family,
|
|
unsigned int index);
|
|
#ifdef USE_HTTPSRR
|
|
const struct Curl_https_rrinfo *Curl_resolv_get_https(struct Curl_easy *data,
|
|
uint32_t resolv_id);
|
|
bool Curl_resolv_knows_https(struct Curl_easy *data, uint32_t resolv_id);
|
|
#endif /* USE_HTTPSRR */
|
|
|
|
#else /* !USE_CURL_ASYNC */
|
|
#define Curl_resolv_shutdown_all(x) Curl_nop_stmt
|
|
#define Curl_resolv_destroy_all(x) Curl_nop_stmt
|
|
#define Curl_resolv_take_result(x, y, z) CURLE_NOT_BUILT_IN
|
|
#define Curl_resolv_elapsed_ms(x, y) CURL_TIMEOUT_RESOLVE_MS
|
|
#define Curl_resolv_has_answers(x, y, z) TRUE
|
|
#define Curl_resolv_get_ai(x, y, z, a) NULL
|
|
#define Curl_resolv_get_https(x, y) NULL
|
|
#define Curl_resolv_knows_https(x, y) TRUE
|
|
#define Curl_resolv_pollset(x, y) CURLE_OK
|
|
#define Curl_resolv_destroy(x, y) Curl_nop_stmt
|
|
#endif /* USE_CURL_ASYNC */
|
|
|
|
#ifdef CURLRES_SYNCH
|
|
/*
|
|
* Curl_sync_getaddrinfo() is the non-async low-level name resolve API.
|
|
* There are several versions of this function - depending on IPV6
|
|
* support and platform.
|
|
*/
|
|
struct Curl_addrinfo *Curl_sync_getaddrinfo(struct Curl_easy *data,
|
|
uint8_t dns_queries,
|
|
const char *hostname,
|
|
uint16_t port,
|
|
uint8_t transport);
|
|
#endif
|
|
|
|
#endif /* HEADER_CURL_HOSTIP_H */
|