mirror of
https://github.com/open-goal/jak-project
synced 2026-08-06 09:54:10 -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)
307 lines
7.8 KiB
Perl
Vendored
Generated
307 lines
7.8 KiB
Perl
Vendored
Generated
#!/usr/bin/env perl
|
|
#***************************************************************************
|
|
# _ _ ____ _
|
|
# Project ___| | | | _ \| |
|
|
# / __| | | | |_) | |
|
|
# | (__| |_| | _ <| |___
|
|
# \___|\___/|_| \_\_____|
|
|
#
|
|
# Copyright (C) Viktor Szakats
|
|
#
|
|
# 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;
|
|
|
|
use File::Basename;
|
|
|
|
my @tabs = (
|
|
'^m4/zz40-xc-ovr\.m4$',
|
|
'Makefile\.(am|example)$',
|
|
'\.sln$',
|
|
'^tests/data/data1706-stdout\.txt',
|
|
'^tests/data/test',
|
|
);
|
|
|
|
my @need_crlf = (
|
|
'\.(bat|sln)$',
|
|
);
|
|
|
|
my @double_empty_lines = (
|
|
'^RELEASE-NOTES$',
|
|
'^lib/.+\.(c|h)$',
|
|
'^projects/OS400/',
|
|
'^projects/vms/',
|
|
'^tests/data/test',
|
|
'\.(m4|py)$',
|
|
);
|
|
|
|
my @longline = (
|
|
'\.github/workflows/windows\.yml$',
|
|
'^renovate\.json$',
|
|
'^docs/DISTROS\.md$',
|
|
'^projects/Windows/tmpl/.+\.vcxproj$',
|
|
'^tests/certs/srp-verifier-',
|
|
'^tests/data/test',
|
|
);
|
|
|
|
my @non_ascii_allowed = (
|
|
'\xC3\xB6', # UTF-8 for https://codepoints.net/U+00F6 LATIN SMALL LETTER O WITH DIAERESIS
|
|
);
|
|
|
|
my $non_ascii_allowed = join(', ', @non_ascii_allowed);
|
|
|
|
my @non_ascii = (
|
|
'^\.github/scripts/pyspelling\.words$',
|
|
'^\.mailmap$',
|
|
'^RELEASE-NOTES$',
|
|
'^docs/BINDINGS\.md$',
|
|
'^docs/THANKS$',
|
|
'^docs/THANKS-filter$',
|
|
);
|
|
|
|
sub fn_match {
|
|
my ($filename, @masklist) = @_;
|
|
|
|
foreach my $mask (@masklist) {
|
|
if($filename =~ $mask) {
|
|
return 1;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
sub eol_detect {
|
|
my ($content) = @_;
|
|
|
|
my $cr = () = $content =~ /\r/g;
|
|
my $lf = () = $content =~ /\n/g;
|
|
|
|
if($cr > 0 && $lf == 0) {
|
|
return 'cr';
|
|
}
|
|
elsif($cr == 0 && $lf > 0) {
|
|
return 'lf';
|
|
}
|
|
elsif($cr == 0 && $lf == 0) {
|
|
return 'bin';
|
|
}
|
|
elsif($cr == $lf) {
|
|
return 'crlf';
|
|
}
|
|
|
|
return '';
|
|
}
|
|
|
|
my $max_repeat_space = 79;
|
|
my $max_line_len = 192;
|
|
my $max_path_len = 64;
|
|
my $max_filename_len = 48;
|
|
|
|
my $issues = 0;
|
|
|
|
open(my $git_ls_files, '-|', 'git', 'ls-files') or die "Failed running git ls-files: $!";
|
|
while(my $filename = <$git_ls_files>) {
|
|
chomp $filename;
|
|
|
|
my @err = ();
|
|
|
|
if(length($filename) > $max_path_len) {
|
|
push @err, sprintf('long (%d > %d) path', length($filename), $max_path_len);
|
|
}
|
|
|
|
my $bn = basename($filename);
|
|
if(length($bn) > $max_filename_len) {
|
|
push @err, sprintf('long (%d > %d) filename', length($bn), $max_filename_len);
|
|
}
|
|
|
|
if($filename !~ /^[A-Za-z0-9\/._-]+$/) {
|
|
push @err, sprintf("filename contains character(s) outside [A-Za-z0-9/._-]");
|
|
}
|
|
|
|
open(my $fh, '<', $filename) or die "Cannot open '$filename': $!";
|
|
my $content = do { local $/; <$fh> };
|
|
close $fh;
|
|
|
|
if(!fn_match($filename, @tabs) &&
|
|
$content =~ /\t/) {
|
|
push @err, 'content: has tab';
|
|
}
|
|
|
|
my $eol = eol_detect($content);
|
|
|
|
if($eol eq '') {
|
|
push @err, 'content: has mixed EOL types';
|
|
}
|
|
|
|
if($eol ne 'crlf' &&
|
|
fn_match($filename, @need_crlf)) {
|
|
push @err, 'content: must use CRLF EOL for this file type';
|
|
}
|
|
|
|
if($eol ne 'lf' && $content ne '' &&
|
|
!fn_match($filename, @need_crlf)) {
|
|
push @err, 'content: must use LF EOL for this file type';
|
|
}
|
|
|
|
if($content =~ /[ \t]\n/) {
|
|
my $line;
|
|
for my $l (split(/\n/, $content)) {
|
|
$line++;
|
|
if($l =~ /[ \t]$/) {
|
|
push @err, "line $line: trailing whitespace";
|
|
}
|
|
}
|
|
}
|
|
|
|
if($content ne '' &&
|
|
$content !~ /\n\z/) {
|
|
push @err, 'content: has no EOL at EOF';
|
|
}
|
|
|
|
if($content =~ /\n\n\z/ ||
|
|
$content =~ /\r\n\r\n\z/) {
|
|
push @err, 'content: has multiple EOL at EOF';
|
|
}
|
|
|
|
if((!fn_match($filename, @double_empty_lines) &&
|
|
($content =~ /\n\n\n/ ||
|
|
$content =~ /\r\n\r\n\r\n/)) ||
|
|
$content =~ />\n\n\n+[<#]/) {
|
|
my $line = 0;
|
|
my $blank = 0;
|
|
for my $l (split(/\n/, $content)) {
|
|
chomp $l;
|
|
$line++;
|
|
if($l =~ /^$/) {
|
|
if($blank) {
|
|
my $lineno = sprintf('duplicate empty line @ line %d', $line);
|
|
push @err, $lineno;
|
|
}
|
|
$blank = 1;
|
|
}
|
|
else {
|
|
$blank = 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
if($content =~ /\n\n\n\n/ ||
|
|
$content =~ /\r\n\r\n\r\n\r\n/) {
|
|
my $line = 0;
|
|
my $blank = 0;
|
|
for my $l (split(/\n/, $content)) {
|
|
chomp $l;
|
|
$line++;
|
|
if($l =~ /^$/) {
|
|
if($blank > 1) {
|
|
my $lineno = sprintf('3 or more consecutive empty lines @ line %d', $line);
|
|
push @err, $lineno;
|
|
}
|
|
$blank++;
|
|
}
|
|
else {
|
|
$blank = 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
if(!fn_match($filename, @longline)) {
|
|
my $line = 0;
|
|
for my $l (split(/\n/, $content)) {
|
|
$line++;
|
|
if(length($l) > $max_line_len) {
|
|
push @err, sprintf('line %d: long (%d > %d) line', $line, length($l), $max_line_len);
|
|
}
|
|
}
|
|
}
|
|
|
|
my $line = 0;
|
|
for my $l (split(/\n/, $content)) {
|
|
$line++;
|
|
if($l =~ /( {$max_repeat_space,})/) {
|
|
push @err, sprintf('line %d: repeat spaces (%d >= %d)', $line, length($1), $max_repeat_space);
|
|
}
|
|
}
|
|
|
|
my $search = $content;
|
|
my $linepos = 0;
|
|
while($search =~ /[^ ] "\n *" [^ ]/) {
|
|
my $part = substr($search, 0, $+[0]);
|
|
$search = substr($search, $+[0]);
|
|
my $line = ($part =~ tr/\n//);
|
|
push @err, sprintf('line %d: double spaces in folded string', $linepos + $line);
|
|
$linepos += $line;
|
|
}
|
|
|
|
$search = $content;
|
|
$linepos = 0;
|
|
while($search =~ /\n\n *}\n/) {
|
|
my $part = substr($search, 0, $+[0] - 1);
|
|
$search = substr($search, $+[0]);
|
|
my $line = ($part =~ tr/\n//);
|
|
push @err, sprintf("line %d: '}' preceded by empty line", $linepos + $line);
|
|
$linepos += $line + 1;
|
|
}
|
|
|
|
$search = $content;
|
|
$linepos = 0;
|
|
while($search =~ /\n\{\n\n/) {
|
|
my $part = substr($search, 0, $+[0]);
|
|
$search = substr($search, $+[0]);
|
|
my $line = ($part =~ tr/\n//);
|
|
push @err, sprintf("line %d: top-level '{' followed by empty line", $linepos + $line);
|
|
$linepos += $line;
|
|
}
|
|
|
|
if($content =~ /([\x00-\x08\x0b\x0c\x0e-\x1f\x7f])/) {
|
|
push @err, 'content: has binary contents';
|
|
}
|
|
|
|
if($filename !~ /tests\/data/) {
|
|
# the tests have no allowed UTF bytes
|
|
$content =~ s/[$non_ascii_allowed]//g;
|
|
}
|
|
|
|
if(!fn_match($filename, @non_ascii) &&
|
|
($content =~ /([\x80-\xff]+)/)) {
|
|
my $non = $1;
|
|
my $hex;
|
|
for my $e (split(//, $non)) {
|
|
$hex .= sprintf('%s%02x', $hex ? ' ': '', ord($e));
|
|
}
|
|
my $line;
|
|
for my $l (split(/\n/, $content)) {
|
|
$line++;
|
|
if($l =~ /([\x80-\xff]+)/) {
|
|
push @err, "line $line: has non-ASCII: '$non' ($hex)";
|
|
}
|
|
}
|
|
}
|
|
|
|
if(@err) {
|
|
$issues++;
|
|
foreach my $err (@err) {
|
|
print "$filename: $err\n";
|
|
}
|
|
}
|
|
}
|
|
close $git_ls_files;
|
|
|
|
if($issues) {
|
|
exit 1;
|
|
}
|