mirror of
https://github.com/open-goal/jak-project
synced 2026-08-30 01:20:38 -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)
147 lines
5.9 KiB
Plaintext
Vendored
Generated
147 lines
5.9 KiB
Plaintext
Vendored
Generated
* curl header API: extract headers post transfer
|
|
*
|
|
h DFTACTGRP(*NO) ACTGRP(*NEW)
|
|
h OPTION(*NOSHOWCPY)
|
|
h BNDDIR('CURL')
|
|
*
|
|
**************************************************************************
|
|
* _ _ ____ _
|
|
* 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 H,CURL.INC
|
|
*
|
|
* Extract headers post transfer with the header API.
|
|
*
|
|
d pi
|
|
d url 120
|
|
*
|
|
d urllen s 10u 0 URL length
|
|
*
|
|
**************************************************************************
|
|
|
|
urllen = trimmed_length(url: %len(url));
|
|
|
|
// Do the curl stuff.
|
|
|
|
curl_global_init(CURL_GLOBAL_ALL);
|
|
main();
|
|
curl_global_cleanup();
|
|
*inlr = *on; // Exit
|
|
*
|
|
**************************************************************************
|
|
* Main procedure: do the curl job.
|
|
**************************************************************************
|
|
*
|
|
p main b
|
|
d main pi
|
|
*
|
|
d h s * Easy handle
|
|
d result s like(CURLcode) Curl return code
|
|
d inz(CURLE_OUT_OF_MEMORY)
|
|
d header ds likeds(curl_header) based(hp)
|
|
d strp1 s * Work string pointer
|
|
d strp2 s * Work string pointer
|
|
d inout s 52 For error display
|
|
|
|
// Create and fill curl handle.
|
|
|
|
h = curl_easy_init();
|
|
if h <> *NULL;
|
|
curl_easy_setopt_ccsid(h: CURLOPT_URL: %subst(url: 1: urllen): 0);
|
|
curl_easy_setopt(h: CURLOPT_FOLLOWLOCATION: 1);
|
|
curl_easy_setopt(h: CURLOPT_WRITEFUNCTION: %paddr(in_data_cb)); // Ignore input data
|
|
|
|
// Perform the request.
|
|
|
|
result = curl_easy_perform(h);
|
|
endif;
|
|
|
|
// Check for error and report if some.
|
|
|
|
if result <> CURLE_OK;
|
|
inout = %str(curl_easy_strerror_ccsid(result: 0));
|
|
dsply '' '*EXT' inout;
|
|
else;
|
|
if curl_easy_header_ccsid(h: 'Content-Type': 0: CURLH_HEADER: -1:
|
|
hp: 0) = CURLHE_OK;
|
|
strp2 = curl_to_ccsid(header.value: 0);
|
|
inout = 'Content-Type: ' + %str(strp2);
|
|
dsply inout;
|
|
curl_free(strp2);
|
|
endif;
|
|
dsply ' All server headers:';
|
|
hp = *NULL;
|
|
dow *on;
|
|
hp = curl_easy_nextheader(h: CURLH_HEADER: -1: hp);
|
|
if hp = *NULL;
|
|
leave;
|
|
endif;
|
|
strp1 = curl_to_ccsid(header.name: 0);
|
|
strp2 = curl_to_ccsid(header.value: 0);
|
|
inout = %str(strp1) + ': ' + %str(strp2) +
|
|
' (' + %char(header.amount) + ')';
|
|
curl_free(strp2);
|
|
curl_free(strp1);
|
|
dsply inout;
|
|
enddo;
|
|
inout = 'Done';
|
|
dsply '' '*EXT' inout;
|
|
curl_easy_cleanup(h); // Release handle
|
|
endif;
|
|
p main e
|
|
*
|
|
**************************************************************************
|
|
* Dummy data input callback procedure.
|
|
**************************************************************************
|
|
*
|
|
p in_data_cb b
|
|
d in_data_cb pi 10u 0
|
|
d ptr * value Input data pointer
|
|
d size 10u 0 value Data element size
|
|
d nmemb 10u 0 value Data element count
|
|
d userdata * value User data pointer
|
|
*
|
|
return size * nmemb;
|
|
p in_data_cb e
|
|
*
|
|
**************************************************************************
|
|
* Get the length of right-trimmed string
|
|
**************************************************************************
|
|
*
|
|
p trimmed_length b
|
|
d trimmed_length pi 10u 0
|
|
d string 999999 const options(*varsize)
|
|
d length 10u 0 value
|
|
*
|
|
d len s 10u 0
|
|
*
|
|
len = %scan(X'00': string: 1: length); // Limit to null-terminated string
|
|
if len = 0;
|
|
len = length + 1;
|
|
endif;
|
|
if len <= 1;
|
|
return 0;
|
|
endif;
|
|
return %checkr(' ': string: len - 1); // Trim right
|
|
p trimmed_length e
|