mirror of
https://github.com/open-goal/jak-project
synced 2026-08-30 01:20:38 -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)
92 lines
3.9 KiB
C
Vendored
Generated
92 lines
3.9 KiB
C
Vendored
Generated
#ifndef HEADER_CURL_CREDS_H
|
|
#define HEADER_CURL_CREDS_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
|
|
*
|
|
***************************************************************************/
|
|
|
|
struct Curl_easy;
|
|
|
|
#define CREDS_NONE 0 /* used for default username/passwd */
|
|
#define CREDS_URL 1 /* username/passwd from URL */
|
|
#define CREDS_OPTION 2 /* username/passwd set with a CURLOPT_ */
|
|
#define CREDS_NETRC 3 /* username/passwd found in netrc */
|
|
|
|
struct Curl_creds {
|
|
const char *user; /* non-NULL, maybe empty string */
|
|
const char *passwd; /* non-NULL, maybe empty string */
|
|
const char *oauth_bearer; /* non-NULL, maybe empty string */
|
|
const char *sasl_authzid; /* non-NULL, maybe empty string */
|
|
const char *sasl_service; /* non-NULL, maybe empty string */
|
|
uint32_t refcount;
|
|
uint8_t source; /* CREDS_* value */
|
|
char buf[1];
|
|
};
|
|
|
|
CURLcode Curl_creds_create(const char *user,
|
|
const char *passwd,
|
|
const char *oauth_bearer,
|
|
const char *sasl_authzid,
|
|
const char *sasl_service,
|
|
uint8_t source,
|
|
struct Curl_creds **pcreds);
|
|
|
|
/* Create credentials by overriding `user` and/or `passwd` in `creds_in` */
|
|
CURLcode Curl_creds_merge(const char *user,
|
|
const char *passwd,
|
|
struct Curl_creds *creds_in,
|
|
uint8_t source,
|
|
struct Curl_creds **pcreds_out);
|
|
|
|
/* Unlink any creds in `*pdest`, assign src, increase src
|
|
* refcount when not NULL. */
|
|
void Curl_creds_link(struct Curl_creds **pdest, struct Curl_creds *src);
|
|
|
|
/* Drop a reference, creds may be passed as NULL */
|
|
void Curl_creds_unlink(struct Curl_creds **pcreds);
|
|
|
|
/* TRUE if both creds are NULL or have same values, except source. */
|
|
bool Curl_creds_same(struct Curl_creds *c1, struct Curl_creds *c2);
|
|
|
|
/* TRUE if both creds are NULL or have all values equal. */
|
|
bool Curl_creds_equal(struct Curl_creds *c1, struct Curl_creds *c2);
|
|
|
|
/* Provides properties for creds or, if creds is NULL, the empty string */
|
|
#define Curl_creds_has_user(c) ((c) && (c)->user[0])
|
|
#define Curl_creds_has_passwd(c) ((c) && (c)->passwd[0])
|
|
#define Curl_creds_has_user_or_pass(c) \
|
|
((c) && ((c)->user[0] || (c)->passwd[0]))
|
|
#define Curl_creds_has_oauth_bearer(c) ((c) && (c)->oauth_bearer[0])
|
|
#define Curl_creds_has_sasl_service(c) ((c) && (c)->sasl_service[0])
|
|
#define Curl_creds_user(c) ((c) ? (c)->user : "")
|
|
#define Curl_creds_passwd(c) ((c) ? (c)->passwd : "")
|
|
#define Curl_creds_oauth_bearer(c) ((c) ? (c)->oauth_bearer : "")
|
|
#define Curl_creds_sasl_authzid(c) ((c) ? (c)->sasl_authzid : "")
|
|
#define Curl_creds_sasl_service(c) ((c) ? (c)->sasl_service : "")
|
|
|
|
#ifdef CURLVERBOSE
|
|
void Curl_creds_trace(struct Curl_easy *data, struct Curl_creds *creds,
|
|
const char *msg);
|
|
#endif
|
|
|
|
#endif /* HEADER_CURL_CREDS_H */
|