mirror of
https://github.com/open-goal/jak-project
synced 2026-08-21 06:38:33 -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)
190 lines
5.8 KiB
C
Vendored
Generated
190 lines
5.8 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"
|
|
|
|
#include <stddef.h> /* for offsetof() */
|
|
|
|
#include "creds.h"
|
|
#include "curl_trc.h"
|
|
#include "strcase.h"
|
|
#include "urldata.h"
|
|
|
|
|
|
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)
|
|
{
|
|
struct Curl_creds *creds = NULL;
|
|
size_t ulen = user ? strlen(user) : 0;
|
|
size_t plen = passwd ? strlen(passwd) : 0;
|
|
size_t olen = oauth_bearer ? strlen(oauth_bearer) : 0;
|
|
size_t salen = sasl_authzid ? strlen(sasl_authzid) : 0;
|
|
size_t sslen = sasl_service ? strlen(sasl_service) : 0;
|
|
char *s, *buf;
|
|
CURLcode result = CURLE_OK;
|
|
|
|
Curl_creds_unlink(pcreds);
|
|
|
|
/* Everything empty/NULL, this is the NULL credential */
|
|
if(!user && !passwd && !olen && !salen && !sslen)
|
|
goto out;
|
|
|
|
if((ulen > CURL_MAX_INPUT_LENGTH) ||
|
|
(plen > CURL_MAX_INPUT_LENGTH) ||
|
|
(olen > CURL_MAX_INPUT_LENGTH) ||
|
|
(salen > CURL_MAX_INPUT_LENGTH) ||
|
|
(sslen > CURL_MAX_INPUT_LENGTH)) {
|
|
result = CURLE_BAD_FUNCTION_ARGUMENT;
|
|
goto out;
|
|
}
|
|
|
|
/* null-terminator for user already part of struct */
|
|
creds = curlx_calloc(1, sizeof(*creds) +
|
|
ulen + plen + 1 + olen + 1 + salen + 1 + sslen + 1);
|
|
if(!creds) {
|
|
result = CURLE_OUT_OF_MEMORY;
|
|
goto out;
|
|
}
|
|
|
|
creds->refcount = 1;
|
|
creds->source = source;
|
|
/* Some compilers try to be too smart about our dynamic struct size */
|
|
buf = ((char *)creds) + offsetof(struct Curl_creds, buf);
|
|
creds->user = s = buf;
|
|
if(ulen)
|
|
memcpy(s, user, ulen + 1);
|
|
creds->passwd = s = buf + ulen + 1;
|
|
if(plen)
|
|
memcpy(s, passwd, plen + 1);
|
|
creds->oauth_bearer = s = buf + ulen + 1 + plen + 1;
|
|
if(olen)
|
|
memcpy(s, oauth_bearer, olen + 1);
|
|
creds->sasl_authzid = s = buf + ulen + 1 + plen + 1 + olen + 1;
|
|
if(salen)
|
|
memcpy(s, sasl_authzid, salen + 1);
|
|
creds->sasl_service = s = buf + ulen + 1 + plen + 1 + olen + 1 + salen + 1;
|
|
if(sslen)
|
|
memcpy(s, sasl_service, sslen + 1);
|
|
|
|
out:
|
|
if(!result)
|
|
*pcreds = creds;
|
|
else
|
|
Curl_creds_unlink(&creds);
|
|
return result;
|
|
}
|
|
|
|
CURLcode Curl_creds_merge(const char *user,
|
|
const char *passwd,
|
|
struct Curl_creds *creds_in,
|
|
uint8_t source,
|
|
struct Curl_creds **pcreds_out)
|
|
{
|
|
struct Curl_creds *creds_out = NULL;
|
|
CURLcode result;
|
|
|
|
if(!creds_in) {
|
|
result = Curl_creds_create(user, passwd, NULL, NULL, NULL,
|
|
source, &creds_out);
|
|
}
|
|
else {
|
|
result = Curl_creds_create(user ? user : Curl_creds_user(creds_in),
|
|
passwd ? passwd : Curl_creds_passwd(creds_in),
|
|
Curl_creds_oauth_bearer(creds_in),
|
|
Curl_creds_sasl_authzid(creds_in),
|
|
Curl_creds_sasl_service(creds_in),
|
|
source, &creds_out);
|
|
}
|
|
Curl_creds_link(pcreds_out, creds_out);
|
|
Curl_creds_unlink(&creds_out);
|
|
return result;
|
|
}
|
|
|
|
void Curl_creds_link(struct Curl_creds **pdest, struct Curl_creds *src)
|
|
{
|
|
if(*pdest != src) {
|
|
Curl_creds_unlink(pdest);
|
|
*pdest = src;
|
|
if(src) {
|
|
DEBUGASSERT(src->refcount < UINT32_MAX);
|
|
src->refcount++;
|
|
}
|
|
}
|
|
}
|
|
|
|
void Curl_creds_unlink(struct Curl_creds **pcreds)
|
|
{
|
|
if(*pcreds) {
|
|
struct Curl_creds *creds = *pcreds;
|
|
|
|
DEBUGASSERT(creds->refcount);
|
|
*pcreds = NULL;
|
|
if(creds->refcount)
|
|
creds->refcount--;
|
|
if(!creds->refcount) {
|
|
curlx_free(creds);
|
|
}
|
|
}
|
|
}
|
|
|
|
bool Curl_creds_same(struct Curl_creds *c1, struct Curl_creds *c2)
|
|
{
|
|
return (c1 == c2) ||
|
|
(c1 && c2 &&
|
|
!Curl_timestrcmp(c1->user, c2->user) &&
|
|
!Curl_timestrcmp(c1->passwd, c2->passwd) &&
|
|
!Curl_timestrcmp(c1->oauth_bearer, c2->oauth_bearer) &&
|
|
!Curl_timestrcmp(c1->sasl_authzid, c2->sasl_authzid) &&
|
|
!Curl_timestrcmp(c1->sasl_service, c2->sasl_service));
|
|
}
|
|
|
|
bool Curl_creds_equal(struct Curl_creds *c1, struct Curl_creds *c2)
|
|
{
|
|
return Curl_creds_same(c1, c2) &&
|
|
((c1 == c2) || (c1 && c2 && (c1->source == c2->source)));
|
|
}
|
|
|
|
#ifdef CURLVERBOSE
|
|
void Curl_creds_trace(struct Curl_easy *data, struct Curl_creds *creds,
|
|
const char *msg)
|
|
{
|
|
if(creds) {
|
|
CURL_TRC_M(data, "%s: user=%s, passwd=%s, "
|
|
"sasl_authzid=%s, oauth_bearer=%s, source=%d",
|
|
msg,
|
|
Curl_creds_user(creds),
|
|
Curl_creds_has_passwd(creds) ? "***" : "",
|
|
Curl_creds_sasl_authzid(creds),
|
|
Curl_creds_has_oauth_bearer(creds) ? "***" : "",
|
|
creds->source);
|
|
}
|
|
else
|
|
CURL_TRC_M(data, "%s: -", msg);
|
|
}
|
|
#endif
|