mirror of
https://github.com/open-goal/jak-project
synced 2026-08-27 16:37:36 -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)
102 lines
2.7 KiB
Perl
Vendored
Generated
102 lines
2.7 KiB
Perl
Vendored
Generated
#!/usr/bin/env perl
|
|
#***************************************************************************
|
|
# _ _ ____ _
|
|
# 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
|
|
#
|
|
###########################################################################
|
|
|
|
# Check that libcurl-errors.3 and the public header files have the same set of
|
|
# error codes.
|
|
|
|
use strict;
|
|
use warnings;
|
|
|
|
# we may get the directory roots pointed out
|
|
my $root = $ARGV[0] || ".";
|
|
my $buildroot = $ARGV[1] || ".";
|
|
my $manpge = "$buildroot/docs/libcurl/libcurl-errors.3";
|
|
my $curlh = "$root/include/curl";
|
|
my $errors = 0;
|
|
|
|
my @hnames;
|
|
my %wherefrom;
|
|
my @mnames;
|
|
my %manfrom;
|
|
|
|
sub scanheader {
|
|
my ($file) = @_;
|
|
open H, "<$file";
|
|
my $line = 0;
|
|
while(<H>) {
|
|
$line++;
|
|
if($_ =~ /^ (CURL(E|UE|SHE|HE|M)_[A-Z0-9_]*)/) {
|
|
my ($name) = ($1);
|
|
if(($name !~ /(OBSOLETE|CURLE_RESERVED)/) && ($name !~ /_LAST\z/)) {
|
|
push @hnames, $name;
|
|
if($wherefrom{$name}) {
|
|
print STDERR "double: $name\n";
|
|
}
|
|
$wherefrom{$name} = "$file:$line";
|
|
}
|
|
}
|
|
}
|
|
close(H);
|
|
}
|
|
|
|
sub scanmanpage {
|
|
my ($file) = @_;
|
|
open H, "<$file";
|
|
my $line = 0;
|
|
while(<H>) {
|
|
$line++;
|
|
if($_ =~ /^\.IP \"(CURL(E|UE|SHE|HE|M)_[A-Z0-9_]*)/) {
|
|
my ($name) = ($1);
|
|
if($name !~ /(CURLM_CALL_MULTI_SOCKET)/) {
|
|
push @mnames, $name;
|
|
$manfrom{$name} = "$file:$line";
|
|
}
|
|
}
|
|
}
|
|
close(H);
|
|
}
|
|
|
|
opendir(my $dh, $curlh) or die "Cannot opendir $curlh: $!";
|
|
my @hfiles = grep { /\.h$/ } readdir($dh);
|
|
closedir $dh;
|
|
|
|
for(sort @hfiles) {
|
|
scanheader("$curlh/$_");
|
|
}
|
|
scanmanpage($manpge);
|
|
|
|
print "Result\n";
|
|
for my $h (sort @hnames) {
|
|
if(!$manfrom{$h}) {
|
|
printf "$h from %s, not in man page\n", $wherefrom{$h};
|
|
}
|
|
}
|
|
|
|
for my $m (sort @mnames) {
|
|
if(!$wherefrom{$m}) {
|
|
printf "$m from %s, not in any header\n", $manfrom{$m};
|
|
}
|
|
}
|