mirror of
https://github.com/open-goal/jak-project
synced 2026-08-20 14:24:45 -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)
163 lines
5.9 KiB
Perl
Vendored
Generated
163 lines
5.9 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
|
|
#
|
|
###########################################################################
|
|
use strict;
|
|
use warnings;
|
|
|
|
# Prepare a directory with known files and clean up afterwards
|
|
use Time::Local;
|
|
|
|
if($#ARGV < 1) {
|
|
print "Usage: $0 prepare|postprocess directory [logfile]\n";
|
|
exit 1;
|
|
}
|
|
|
|
# <precheck> expects an error message on stdout
|
|
sub errout {
|
|
print $_[0] . "\n";
|
|
exit 1;
|
|
}
|
|
|
|
if($ARGV[0] eq "prepare") {
|
|
my $dirname = $ARGV[1];
|
|
mkdir $dirname or errout "$!";
|
|
chdir $dirname;
|
|
|
|
# Create the files in alphabetical order, to increase the chances
|
|
# of receiving a consistent set of directory contents regardless
|
|
# of whether the server alphabetizes the results or not.
|
|
mkdir "asubdir" or errout "$!";
|
|
chmod 0777, "asubdir";
|
|
|
|
open(FILE, ">plainfile.txt") or errout "$!";
|
|
binmode FILE;
|
|
print FILE "Test file to support curl test suite\n";
|
|
close(FILE);
|
|
# The mtime is specifically chosen to be an even number so that it can be
|
|
# represented exactly on a FAT file system.
|
|
utime time, timegm(0,0,12,1,0,100), "plainfile.txt";
|
|
chmod 0666, "plainfile.txt";
|
|
|
|
open(FILE, ">emptyfile.txt") or errout "$!";
|
|
binmode FILE;
|
|
close(FILE);
|
|
# The mtime is specifically chosen to be an even number so that it can be
|
|
# represented exactly on a FAT file system.
|
|
utime time, timegm(0,0,12,1,0,100), "emptyfile.txt";
|
|
chmod 0666, "emptyfile.txt";
|
|
|
|
open(FILE, ">rofile.txt") or errout "$!";
|
|
binmode FILE;
|
|
print FILE "Read-only test file to support curl test suite\n";
|
|
close(FILE);
|
|
# The mtime is specifically chosen to be an even number so that it can be
|
|
# represented exactly on a FAT file system.
|
|
utime time, timegm(0,0,12,31,11,100), "rofile.txt";
|
|
chmod 0444, "rofile.txt";
|
|
if($^O eq 'cygwin') {
|
|
system('chattr', ('+r', 'rofile.txt'));
|
|
}
|
|
|
|
exit 0;
|
|
}
|
|
elsif($ARGV[0] eq "postprocess") {
|
|
my $dirname = $ARGV[1];
|
|
|
|
# Clean up the test directory
|
|
if($^O eq 'cygwin') {
|
|
system('chattr', ('-r', "$dirname/rofile.txt"));
|
|
}
|
|
chmod 0666, "$dirname/rofile.txt";
|
|
unlink "$dirname/rofile.txt";
|
|
unlink "$dirname/emptyfile.txt";
|
|
unlink "$dirname/plainfile.txt";
|
|
rmdir "$dirname/asubdir";
|
|
|
|
rmdir $dirname or die "$!";
|
|
|
|
if($#ARGV >= 3) { # Verify mtime if requested
|
|
my $checkfile = $ARGV[2];
|
|
my $expected_mtime = int($ARGV[3]);
|
|
my $mtime = (stat($checkfile))[9];
|
|
exit ($mtime != $expected_mtime);
|
|
}
|
|
|
|
my $logfile = $ARGV[2];
|
|
if($logfile && -s $logfile) {
|
|
# Process the directory file to remove all information that
|
|
# could be inconsistent from one test run to the next (e.g.
|
|
# file date) or may be unsupported on some platforms (e.g.
|
|
# Windows). Also, since 7.17.0, the sftp directory listing
|
|
# format can be dependent on the server (with a recent
|
|
# enough version of libssh2) so this script must also
|
|
# canonicalize the format. Here are examples of the general
|
|
# format supported:
|
|
# -r--r--r-- 12 ausername grp 47 Dec 31 2000 rofile.txt
|
|
# -r--r--r-- 1 1234 4321 47 Dec 31 2000 rofile.txt
|
|
# The "canonical" format is similar to the first (which is
|
|
# the one generated on a typical Linux installation):
|
|
# -r-?r-?r-? 12 U U 47 Dec 31 2000 rofile.txt
|
|
|
|
my @canondir;
|
|
open(IN, "<$logfile") or die "$!";
|
|
while(<IN>) {
|
|
/^(.)(..).(..).(..).\s*(\S+)\s+\S+\s+\S+\s+(\S+)\s+(\S+\s+\S+\s+\S+)\s+(.*)$/;
|
|
if($1 eq "d") {
|
|
# Skip current and parent directory listing, because some SSH
|
|
# servers (eg. OpenSSH for Windows) are not listing those
|
|
if($8 eq "." || $8 eq "..") {
|
|
next;
|
|
}
|
|
# Erase all directory metadata except for the name, as it is not
|
|
# consistent for across all test systems and file systems
|
|
push @canondir, "d????????? N U U N ??? N NN:NN $8\n";
|
|
} elsif($1 eq "-") {
|
|
# Ignore group and other permissions, because these may vary on
|
|
# some systems (e.g. on Windows)
|
|
# Erase user and group names, as they are not consistent across
|
|
# all test systems
|
|
my $line = sprintf("%s%s???????%5d U U %15d %s %s\n", $1,$2,$5,$6,$7,$8);
|
|
push @canondir, $line;
|
|
} else {
|
|
# Unexpected format; pass it through and let the test fail
|
|
push @canondir, $_;
|
|
}
|
|
}
|
|
close(IN);
|
|
|
|
@canondir = sort {substr($a, 57) cmp substr($b, 57)} @canondir;
|
|
my $newfile = $logfile . ".new";
|
|
open(OUT, ">$newfile") or die "$!";
|
|
print OUT join('', @canondir);
|
|
close(OUT);
|
|
|
|
unlink $logfile;
|
|
rename $newfile, $logfile;
|
|
}
|
|
|
|
exit 0;
|
|
}
|
|
print "Unsupported command $ARGV[0]\n";
|
|
exit 1;
|