mirror of
https://github.com/open-goal/jak-project
synced 2026-08-31 01:31:07 -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)
395 lines
11 KiB
Perl
Vendored
Generated
395 lines
11 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
|
|
#
|
|
###########################################################################
|
|
#
|
|
# Scan man page(s) and detect some simple and yet common formatting mistakes.
|
|
#
|
|
# Output all deviances to stderr.
|
|
|
|
use strict;
|
|
use warnings;
|
|
use File::Basename;
|
|
|
|
# get the filename first
|
|
my $symbolsinversions = shift @ARGV;
|
|
|
|
# we may get the directory roots pointed out
|
|
my @manpages = @ARGV;
|
|
my $errors = 0;
|
|
|
|
my %docsdirs;
|
|
my %optblessed;
|
|
my %funcblessed;
|
|
my @optorder = (
|
|
'NAME',
|
|
'SYNOPSIS',
|
|
'DESCRIPTION',
|
|
#'DEFAULT', # CURLINFO_ has no default
|
|
'PROTOCOLS',
|
|
'EXAMPLE',
|
|
'AVAILABILITY',
|
|
'RETURN VALUE',
|
|
'SEE ALSO'
|
|
);
|
|
my @funcorder = (
|
|
'NAME',
|
|
'SYNOPSIS',
|
|
'DESCRIPTION',
|
|
'EXAMPLE',
|
|
'AVAILABILITY',
|
|
'RETURN VALUE',
|
|
'SEE ALSO'
|
|
);
|
|
my %shline; # section => line number
|
|
|
|
my %symbol;
|
|
|
|
# some CURLINFO_ symbols are not actual options for curl_easy_getinfo,
|
|
# mark them as "deprecated" to hide them from link-warnings
|
|
my %deprecated = (
|
|
CURLINFO_TEXT => 1,
|
|
CURLINFO_HEADER_IN => 1,
|
|
CURLINFO_HEADER_OUT => 1,
|
|
CURLINFO_DATA_IN => 1,
|
|
CURLINFO_DATA_OUT => 1,
|
|
CURLINFO_SSL_DATA_IN => 1,
|
|
CURLINFO_SSL_DATA_OUT => 1,
|
|
CURLOPT_EGDSOCKET => 1,
|
|
CURLOPT_RANDOM_FILE => 1,
|
|
);
|
|
sub allsymbols {
|
|
open(my $f, "<", $symbolsinversions) or die "$symbolsinversions: $|";
|
|
while(<$f>) {
|
|
if($_ =~ /^([^ ]*) +(.*)/) {
|
|
my ($name, $info) = ($1, $2);
|
|
$symbol{$name} = $name;
|
|
|
|
if($info =~ /([0-9.]+) +([0-9.]+)/) {
|
|
$deprecated{$name} = $info;
|
|
}
|
|
}
|
|
}
|
|
close($f);
|
|
}
|
|
|
|
my %ref = (
|
|
'curl.1' => 1
|
|
);
|
|
sub checkref {
|
|
my ($f, $sec, $file, $line) = @_;
|
|
my $present = 0;
|
|
#print STDERR "check $f.$sec\n";
|
|
if($ref{"$f.$sec"}) {
|
|
# present
|
|
return;
|
|
}
|
|
foreach my $d (keys %docsdirs) {
|
|
if(-f "$d/$f.$sec") {
|
|
$present = 1;
|
|
$ref{"$f.$sec"} = 1;
|
|
last;
|
|
}
|
|
}
|
|
if(!$present) {
|
|
print STDERR "$file:$line broken reference to $f($sec)\n";
|
|
$errors++;
|
|
}
|
|
}
|
|
|
|
# option-looking words that are not options
|
|
my %allownonref = (
|
|
'CURLINFO_TEXT' => 1,
|
|
'CURLINFO_HEADER_IN' => 1,
|
|
'CURLINFO_HEADER_OUT' => 1,
|
|
'CURLINFO_DATA_IN' => 1,
|
|
'CURLINFO_DATA_OUT' => 1,
|
|
'CURLINFO_SSL_DATA_IN' => 1,
|
|
'CURLINFO_SSL_DATA_OUT' => 1,
|
|
);
|
|
|
|
sub scanmanpage {
|
|
my ($file) = @_;
|
|
my $reqex = 0;
|
|
my $inseealso = 0;
|
|
my $inexample = 0;
|
|
my $insynop = 0;
|
|
my $exsize = 0;
|
|
my $synopsize = 0;
|
|
my $shc = 0;
|
|
my $optpage = 0; # option or function
|
|
my @sh;
|
|
my $SH = "";
|
|
my @separators;
|
|
my @sepline;
|
|
|
|
open(my $m, "<", $file) or die "test1173.pl could not open $file";
|
|
if($file =~ /[\/\\](CURL|curl_)([^\/\\]*).3/) {
|
|
# This is a man page for libcurl. It requires an example unless it is
|
|
# considered deprecated.
|
|
$reqex = 1 unless defined $deprecated{'CURL'.$2};
|
|
if($1 eq "CURL") {
|
|
$optpage = 1;
|
|
}
|
|
}
|
|
my $line = 1;
|
|
while(<$m>) {
|
|
chomp;
|
|
if($_ =~ /^.so /) {
|
|
# this man page is a referral
|
|
close($m);
|
|
return;
|
|
}
|
|
if(($_ =~ /^\.SH SYNOPSIS/i) && ($reqex)) {
|
|
# this is for libcurl man page SYNOPSIS checks
|
|
$insynop = 1;
|
|
$inexample = 0;
|
|
}
|
|
elsif($_ =~ /^\.SH EXAMPLE/i) {
|
|
$insynop = 0;
|
|
$inexample = 1;
|
|
}
|
|
elsif($_ =~ /^\.SH \"SEE ALSO\"/i) {
|
|
$inseealso = 1;
|
|
}
|
|
elsif($_ =~ /^\.SH/i) {
|
|
$insynop = 0;
|
|
$inexample = 0;
|
|
}
|
|
elsif($inseealso) {
|
|
if($_ =~ /^\.BR (.*)/i) {
|
|
my $f = $1;
|
|
if($f =~ /^(lib|)curl/i) {
|
|
$f =~ s/[\n\r]//g;
|
|
if($f =~ s/([a-z_0-9-]*) \(([13])\)([, ]*)//i) {
|
|
push @separators, $3;
|
|
push @sepline, $line;
|
|
checkref($1, $2, $file, $line);
|
|
}
|
|
if($f !~ /^ *$/) {
|
|
print STDERR "$file:$line bad SEE ALSO format\n";
|
|
$errors++;
|
|
}
|
|
}
|
|
else {
|
|
if($f =~ /.*(, *)\z/) {
|
|
push @separators, $1;
|
|
push @sepline, $line;
|
|
}
|
|
else {
|
|
push @separators, " ";
|
|
push @sepline, $line;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
elsif($inexample) {
|
|
$exsize++;
|
|
if($_ =~ /[^\\]\\n/) {
|
|
print STDERR "$file:$line '\\n' need to be '\\\\n'!\n";
|
|
}
|
|
}
|
|
elsif($insynop) {
|
|
$synopsize++;
|
|
if(($synopsize == 1) && ($_ !~ /\.nf/)) {
|
|
print STDERR "$file:$line:1:ERROR: be .nf for proper formatting\n";
|
|
}
|
|
}
|
|
if($_ =~ /^\.SH ([^\r\n]*)/i) {
|
|
my $n = $1;
|
|
# remove enclosing quotes
|
|
$n =~ s/\"(.*)\"\z/$1/;
|
|
push @sh, $n;
|
|
$shline{$n} = $line;
|
|
$SH = $n;
|
|
}
|
|
|
|
if($_ =~ /^\'/) {
|
|
print STDERR "$file:$line line starts with single quote!\n";
|
|
$errors++;
|
|
}
|
|
if($_ =~ /\\f([BI])(.*)/) {
|
|
my ($format, $rest) = ($1, $2);
|
|
if($rest !~ /\\fP/) {
|
|
print STDERR "$file:$line missing \\f${format} terminator!\n";
|
|
$errors++;
|
|
}
|
|
}
|
|
my $c = $_;
|
|
while($c =~ s/\\f([BI])((lib|)curl[a-z_0-9-]*)\(([13])\)//i) {
|
|
checkref($2, $4, $file, $line);
|
|
}
|
|
if(($_ =~ /\\f([BI])((libcurl|CURLOPT_|CURLSHOPT_|CURLINFO_|CURLMOPT_|curl_easy_|curl_multi_|curl_url|curl_mime|curl_global|curl_share)[a-zA-Z_0-9-]+)(.)/) &&
|
|
($4 ne "(")) {
|
|
my $word = $2;
|
|
|
|
if(!$allownonref{$word}) {
|
|
print STDERR "$file:$line curl ref to $word without section\n";
|
|
$errors++;
|
|
}
|
|
}
|
|
if($_ =~ /(.*)\\f([^BIP])/) {
|
|
my ($pre, $format) = ($1, $2);
|
|
if($pre !~ /\\\z/) {
|
|
# only if there was not another backslash before the \f
|
|
print STDERR "$file:$line suspicious \\f format!\n";
|
|
$errors++;
|
|
}
|
|
}
|
|
if(($SH =~ /^(DESCRIPTION|RETURN VALUE|AVAILABILITY)/i) &&
|
|
($_ =~ /(.*)((curl_multi|curl_easy|curl_url|curl_global|curl_url|curl_share)[a-zA-Z_0-9-]+)/) &&
|
|
($1 !~ /\\fI$/)) {
|
|
print STDERR "$file:$line unrefed curl call: $2\n";
|
|
$errors++;
|
|
}
|
|
|
|
if($optpage && $SH && ($SH !~ /^(SYNOPSIS|EXAMPLE|NAME|SEE ALSO)/i) &&
|
|
($_ =~ /(.*)(CURL(OPT_|MOPT_|INFO_|SHOPT_)[A-Z0-9_]*)/)) {
|
|
# an option with its own man page, check that it is tagged
|
|
# for linking
|
|
my ($pref, $symbol) = ($1, $2);
|
|
if($deprecated{$symbol}) {
|
|
# let it be
|
|
}
|
|
elsif($pref !~ /\\fI\z/) {
|
|
print STDERR "$file:$line option $symbol missing \\fI tagging\n";
|
|
$errors++;
|
|
}
|
|
}
|
|
if($_ =~ /[ \t]+$/) {
|
|
print STDERR "$file:$line trailing whitespace\n";
|
|
$errors++;
|
|
}
|
|
$line++;
|
|
}
|
|
close($m);
|
|
|
|
if(@separators) {
|
|
# all except the last one need comma
|
|
for(0 .. $#separators - 1) {
|
|
my $l = $_;
|
|
my $sep = $separators[$l];
|
|
if($sep ne ",") {
|
|
printf STDERR "$file:%d: bad not-last SEE ALSO separator: '%s'\n",
|
|
$sepline[$l], $sep;
|
|
$errors++;
|
|
}
|
|
}
|
|
# the last one should not do comma
|
|
my $sep = $separators[$#separators];
|
|
if($sep eq ",") {
|
|
printf STDERR "$file:%d: superfluous comma separator\n",
|
|
$sepline[$#separators];
|
|
$errors++;
|
|
}
|
|
}
|
|
|
|
if($reqex) {
|
|
# only for libcurl options man-pages
|
|
|
|
my $shcount = scalar(@sh); # before @sh gets shifted
|
|
if($exsize < 2) {
|
|
print STDERR "$file:$line missing EXAMPLE section\n";
|
|
$errors++;
|
|
}
|
|
|
|
if($shcount < 3) {
|
|
print STDERR "$file:$line too few man page sections!\n";
|
|
$errors++;
|
|
return;
|
|
}
|
|
|
|
my $got = "start";
|
|
my $i = 0;
|
|
my $shused = 1;
|
|
my @shorig = @sh;
|
|
my @order = $optpage ? @optorder : @funcorder;
|
|
my $blessed = $optpage ? \%optblessed : \%funcblessed;
|
|
|
|
while($got) {
|
|
my $finesh;
|
|
$got = shift(@sh);
|
|
if($got) {
|
|
if($$blessed{$got}) {
|
|
$i = $$blessed{$got};
|
|
$finesh = $got; # a mandatory one
|
|
}
|
|
}
|
|
if($i && defined($finesh)) {
|
|
# mandatory section
|
|
|
|
if($i != $shused) {
|
|
printf STDERR "$file:%u Got %s, when %s was expected\n",
|
|
$shline{$finesh},
|
|
$finesh,
|
|
$order[$shused-1];
|
|
$errors++;
|
|
return;
|
|
}
|
|
$shused++;
|
|
if($i == scalar(@order)) {
|
|
# last mandatory one, exit
|
|
last;
|
|
}
|
|
}
|
|
}
|
|
|
|
if($i != scalar(@order)) {
|
|
printf STDERR "$file:$line missing mandatory section: %s\n",
|
|
$order[$i];
|
|
printf STDERR "$file:$line section found at index %u: '%s'\n",
|
|
$i, $shorig[$i];
|
|
printf STDERR " Found %u used sections\n", $shcount;
|
|
$errors++;
|
|
}
|
|
}
|
|
}
|
|
|
|
allsymbols();
|
|
|
|
if(!$symbol{'CURLALTSVC_H1'}) {
|
|
print STDERR "did not get the symbols-in-version!\n";
|
|
exit;
|
|
}
|
|
|
|
my $ind = 1;
|
|
for my $s (@optorder) {
|
|
$optblessed{$s} = $ind++
|
|
}
|
|
$ind = 1;
|
|
for my $s (@funcorder) {
|
|
$funcblessed{$s} = $ind++
|
|
}
|
|
|
|
for my $m (@manpages) {
|
|
$docsdirs{dirname($m)}++;
|
|
}
|
|
|
|
for my $m (@manpages) {
|
|
scanmanpage($m);
|
|
}
|
|
|
|
print STDERR "ok\n" if(!$errors);
|
|
|
|
exit $errors;
|