mirror of
https://github.com/open-goal/jak-project
synced 2026-08-20 22:35:07 -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)
148 lines
6.3 KiB
C
Vendored
Generated
148 lines
6.3 KiB
C
Vendored
Generated
#ifndef HEADER_CURL_SETUP_OS400_H
|
|
#define HEADER_CURL_SETUP_OS400_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
|
|
*
|
|
***************************************************************************/
|
|
|
|
/* OS/400 netdb.h does not define NI_MAXHOST. */
|
|
#define NI_MAXHOST 1025
|
|
|
|
/* OS/400 netdb.h does not define NI_MAXSERV. */
|
|
#define NI_MAXSERV 32
|
|
|
|
/* OS/400 has no idea of a tty! */
|
|
#define isatty(fd) 0
|
|
|
|
/* Workaround bug in IBM QADRT runtime library:
|
|
* function puts() does not output the implicit trailing newline.
|
|
*/
|
|
|
|
#include <stdio.h> /* Be sure it is loaded. */
|
|
#undef puts
|
|
#define puts(s) (fputs(s, stdout) == EOF ? EOF : putchar('\n'))
|
|
|
|
/* System API wrapper prototypes & definitions to support ASCII parameters. */
|
|
|
|
#include <sys/socket.h>
|
|
#include <netdb.h>
|
|
#include <gskssl.h>
|
|
#include <qsoasync.h>
|
|
#include <gssapi.h>
|
|
|
|
#ifdef BUILDING_LIBCURL
|
|
|
|
extern int Curl_getaddrinfo_a(const char *nodename,
|
|
const char *servname,
|
|
const struct addrinfo *hints,
|
|
struct addrinfo **res);
|
|
#define getaddrinfo Curl_getaddrinfo_a
|
|
|
|
/* Note socklen_t must be used as this is declared before curl_socklen_t */
|
|
extern int Curl_getnameinfo_a(const struct sockaddr *sa,
|
|
socklen_t salen,
|
|
char *nodename, socklen_t nodenamelen,
|
|
char *servname, socklen_t servnamelen,
|
|
int flags);
|
|
#define getnameinfo Curl_getnameinfo_a
|
|
|
|
/* GSSAPI wrappers. */
|
|
|
|
extern OM_uint32 Curl_gss_import_name_a(OM_uint32 *minor_status,
|
|
gss_buffer_t in_name,
|
|
gss_OID in_name_type,
|
|
gss_name_t *out_name);
|
|
#define gss_import_name Curl_gss_import_name_a
|
|
|
|
extern OM_uint32 Curl_gss_display_status_a(OM_uint32 *minor_status,
|
|
OM_uint32 status_value,
|
|
int status_type, gss_OID mech_type,
|
|
gss_msg_ctx_t *message_context,
|
|
gss_buffer_t status_string);
|
|
#define gss_display_status Curl_gss_display_status_a
|
|
|
|
extern OM_uint32 Curl_gss_init_sec_context_a(OM_uint32 *minor_status,
|
|
gss_cred_id_t cred_handle,
|
|
gss_ctx_id_t *context_handle,
|
|
gss_name_t target_name,
|
|
gss_OID mech_type,
|
|
gss_flags_t req_flags,
|
|
OM_uint32 time_req,
|
|
gss_channel_bindings_t
|
|
input_chan_bindings,
|
|
gss_buffer_t input_token,
|
|
gss_OID *actual_mech_type,
|
|
gss_buffer_t output_token,
|
|
gss_flags_t *ret_flags,
|
|
OM_uint32 *time_rec);
|
|
#define gss_init_sec_context Curl_gss_init_sec_context_a
|
|
|
|
extern OM_uint32 Curl_gss_delete_sec_context_a(OM_uint32 *minor_status,
|
|
gss_ctx_id_t *context_handle,
|
|
gss_buffer_t output_token);
|
|
#define gss_delete_sec_context Curl_gss_delete_sec_context_a
|
|
|
|
/* LDAP wrappers. */
|
|
|
|
#define BerValue struct berval
|
|
|
|
#define ldap_url_parse ldap_url_parse_utf8
|
|
#define ldap_init Curl_ldap_init_a
|
|
#define ldap_simple_bind_s Curl_ldap_simple_bind_s_a
|
|
#define ldap_search_s Curl_ldap_search_s_a
|
|
#define ldap_get_values_len Curl_ldap_get_values_len_a
|
|
#define ldap_err2string Curl_ldap_err2string_a
|
|
#define ldap_get_dn Curl_ldap_get_dn_a
|
|
#define ldap_first_attribute Curl_ldap_first_attribute_a
|
|
#define ldap_next_attribute Curl_ldap_next_attribute_a
|
|
|
|
/* Some socket functions must be wrapped to process textual addresses
|
|
like AF_UNIX. */
|
|
|
|
extern int Curl_os400_connect(int sd, struct sockaddr *destaddr, int addrlen);
|
|
extern int Curl_os400_bind(int sd, struct sockaddr *localaddr, int addrlen);
|
|
extern int Curl_os400_sendto(int sd, char *buffer, int buflen, int flags,
|
|
const struct sockaddr *dstaddr, int addrlen);
|
|
extern int Curl_os400_recvfrom(int sd, char *buffer, int buflen, int flags,
|
|
struct sockaddr *fromaddr, int *addrlen);
|
|
extern int Curl_os400_getpeername(int sd, struct sockaddr *addr, int *addrlen);
|
|
extern int Curl_os400_getsockname(int sd, struct sockaddr *addr, int *addrlen);
|
|
|
|
#define connect Curl_os400_connect
|
|
#define bind Curl_os400_bind
|
|
#define sendto Curl_os400_sendto
|
|
#define recvfrom Curl_os400_recvfrom
|
|
#define getpeername Curl_os400_getpeername
|
|
#define getsockname Curl_os400_getsockname
|
|
|
|
#ifdef HAVE_LIBZ
|
|
#define zlibVersion Curl_os400_zlibVersion
|
|
#define inflateInit_ Curl_os400_inflateInit_
|
|
#define inflateInit2_ Curl_os400_inflateInit2_
|
|
#define inflate Curl_os400_inflate
|
|
#define inflateEnd Curl_os400_inflateEnd
|
|
#endif
|
|
|
|
#endif /* BUILDING_LIBCURL */
|
|
|
|
#endif /* HEADER_CURL_SETUP_OS400_H */
|