mirror of
https://github.com/open-goal/jak-project
synced 2026-09-10 20:29:51 -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)
317 lines
8.7 KiB
Perl
Vendored
Generated
317 lines
8.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
|
|
#
|
|
###########################################################################
|
|
#
|
|
# Scan symbols-in-version (which is verified to be correct by test 1119), then
|
|
# verify that each option mention in there that should have its own man page
|
|
# actually does.
|
|
#
|
|
# In addition, make sure that every current option to curl_easy_setopt,
|
|
# curl_easy_getinfo and curl_multi_setopt are also mentioned in their
|
|
# corresponding main (index) man page.
|
|
#
|
|
# src/tool_getparam.c lists all options curl can parse
|
|
# docs/curl.1 documents all command line options
|
|
# src/tool_listhelp.c outputs all options with curl -h
|
|
# - make sure they are all in sync
|
|
#
|
|
# Output all deviances to stderr.
|
|
|
|
use strict;
|
|
use warnings;
|
|
|
|
# we may get the directory roots pointed out
|
|
my $root = $ARGV[0] || ".";
|
|
my $buildroot = $ARGV[1] || ".";
|
|
my $syms = "$root/docs/libcurl/symbols-in-versions";
|
|
my $curlh = "$root/include/curl/curl.h";
|
|
my $errors = 0;
|
|
|
|
# the prepopulated alias list is the CURLINFO_* defines that are used for the
|
|
# debug function callback and the fact that they use the same prefix as the
|
|
# curl_easy_getinfo options was a mistake.
|
|
my %alias = (
|
|
'CURLINFO_DATA_IN' => 'none',
|
|
'CURLINFO_DATA_OUT' => 'none',
|
|
'CURLINFO_END' => 'none',
|
|
'CURLINFO_HEADER_IN' => 'none',
|
|
'CURLINFO_HEADER_OUT' => 'none',
|
|
'CURLINFO_LASTONE' => 'none',
|
|
'CURLINFO_NONE' => 'none',
|
|
'CURLINFO_SSL_DATA_IN' => 'none',
|
|
'CURLINFO_SSL_DATA_OUT' => 'none',
|
|
'CURLINFO_TEXT' => 'none'
|
|
);
|
|
|
|
sub scanmdpage {
|
|
my ($file, @words) = @_;
|
|
|
|
open(my $mh, "<", $file) or die "could not open $file";
|
|
my @m;
|
|
while(<$mh>) {
|
|
if($_ =~ /^## (.*)/) {
|
|
my $w = $1;
|
|
# "unquote" minuses
|
|
$w =~ s/\\-/-/g;
|
|
push @m, $w;
|
|
}
|
|
}
|
|
close($mh);
|
|
|
|
my @ms = sort @m;
|
|
for my $i (0 .. $#m) {
|
|
if($ms[$i] ne $m[$i]) {
|
|
print STDERR "$file:1:ERROR: $m[$i] is not alphabetical (expected $ms[$i])\n";
|
|
$errors++;
|
|
# no point in reporting many
|
|
last;
|
|
}
|
|
}
|
|
foreach my $m (@words) {
|
|
my @g = grep(/$m\b/, @m);
|
|
if(!$g[0]) {
|
|
print STDERR "Missing mention of $m in $file\n";
|
|
$errors++;
|
|
}
|
|
}
|
|
}
|
|
|
|
my $r;
|
|
|
|
# check for define aliases
|
|
open($r, "<", $curlh) or die "no curl.h";
|
|
while(<$r>) {
|
|
if(/^\#define (CURL(OPT|INFO|MOPT)_\w+) (.*)/) {
|
|
$alias{$1} = $3;
|
|
}
|
|
}
|
|
close($r);
|
|
|
|
my @curlopt;
|
|
my @curlinfo;
|
|
my @curlmopt;
|
|
open($r, "<", $syms) or die "no input file";
|
|
while(<$r>) {
|
|
chomp;
|
|
my $l= $_;
|
|
if($l =~ /(CURL(OPT|INFO|MOPT)_\w+) *([0-9.]*) *([0-9.-]*) *([0-9.]*)/) {
|
|
my ($opt, $type, $add, $dep, $rem) = ($1, $2, $3, $4, $5);
|
|
|
|
if($alias{$opt}) {
|
|
#print "$opt => $alias{$opt}\n";
|
|
}
|
|
elsif($rem) {
|
|
# $opt was removed in $rem
|
|
# so do not check for that
|
|
}
|
|
else {
|
|
if($type eq "OPT") {
|
|
push @curlopt, $opt,
|
|
}
|
|
elsif($type eq "INFO") {
|
|
push @curlinfo, $opt,
|
|
}
|
|
elsif($type eq "MOPT") {
|
|
push @curlmopt, $opt,
|
|
}
|
|
if(! -f "$root/docs/libcurl/opts/$opt.md") {
|
|
print STDERR "Missing $opt.md\n";
|
|
$errors++;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
close($r);
|
|
|
|
scanmdpage("$root/docs/libcurl/curl_easy_setopt.md", @curlopt);
|
|
scanmdpage("$root/docs/libcurl/curl_easy_getinfo.md", @curlinfo);
|
|
scanmdpage("$root/docs/libcurl/curl_multi_setopt.md", @curlmopt);
|
|
|
|
# using this hash array, we can skip specific options
|
|
my %opts = (
|
|
# pretend these --no options exists in tool_getparam.c
|
|
'--no-alpn' => 1,
|
|
'--no-npn' => 1,
|
|
'-N, --no-buffer' => 1,
|
|
'--no-sessionid' => 1,
|
|
'--no-keepalive' => 1,
|
|
'--no-progress-meter' => 1,
|
|
'--no-clobber' => 1,
|
|
|
|
# pretend these options without -no exist in curl.1 and tool_listhelp.c
|
|
'--alpn' => 6,
|
|
'--npn' => 6,
|
|
'--eprt' => 6,
|
|
'--epsv' => 6,
|
|
'--keepalive' => 6,
|
|
'-N, --buffer' => 6,
|
|
'--sessionid' => 6,
|
|
'--progress-meter' => 6,
|
|
'--clobber' => 6,
|
|
|
|
# deprecated options do not need to be in tool_help.c nor curl.1
|
|
'--krb4' => 6,
|
|
'--ftp-ssl' => 6,
|
|
'--ftp-ssl-reqd' => 6,
|
|
'--include' => 6,
|
|
|
|
# for tests and debug only, can remain hidden
|
|
'--test-duphandle' => 6,
|
|
'--test-event' => 6,
|
|
'--wdebug' => 6,
|
|
);
|
|
|
|
#########################################################################
|
|
# parse the curl code that parses the command line arguments!
|
|
open($r, "<", "$root/src/tool_getparam.c") or die "no input file";
|
|
my $list;
|
|
my @getparam; # store all parsed parameters
|
|
|
|
my $prevlong = "";
|
|
my $no = 0;
|
|
while(<$r>) {
|
|
$no++;
|
|
chomp;
|
|
if(/struct LongShort aliases/) {
|
|
$list = 1;
|
|
}
|
|
elsif($list) {
|
|
if(/^ \{(\"[^,]*\").*\'(.)\',/) {
|
|
my ($l, $s) = ($1, $2);
|
|
my $sh;
|
|
my $lo;
|
|
my $title;
|
|
if(($l cmp $prevlong) < 0) {
|
|
print STDERR "tool_getparam.c:$no: '$l' is NOT placed in alpha-order\n";
|
|
}
|
|
if($l =~ /\"(.*)\"/) {
|
|
# long option
|
|
$lo = $1;
|
|
$title = "--$lo";
|
|
}
|
|
if($s ne " ") {
|
|
# a short option
|
|
$sh = $s;
|
|
$title = "-$sh, $title";
|
|
}
|
|
push @getparam, $title;
|
|
$opts{$title} |= 1;
|
|
$prevlong = $l;
|
|
}
|
|
}
|
|
}
|
|
close($r);
|
|
|
|
#########################################################################
|
|
# parse the curl.1 man page, extract all documented command line options
|
|
# The man page may or may not be rebuilt, so check both possible locations
|
|
open($r, "<", "$buildroot/docs/cmdline-opts/curl.1") or
|
|
open($r, "<", "$root/docs/cmdline-opts/curl.1") or
|
|
die "failed getting curl.1";
|
|
my @manpage; # store all parsed parameters
|
|
while(<$r>) {
|
|
chomp;
|
|
my $l= $_;
|
|
$l =~ s/\\-/-/g;
|
|
if($l =~ /^\.IP \"(-[^\"]*)\"/) {
|
|
my $str = $1;
|
|
my $combo;
|
|
if($str =~ /^-(.), --([a-z0-9.-]*)/) {
|
|
# figure out the -short, --long combo
|
|
$combo = "-$1, --$2";
|
|
}
|
|
elsif($str =~ /^--([a-z0-9.-]*)/) {
|
|
# figure out the --long name
|
|
$combo = "--$1";
|
|
}
|
|
if($combo) {
|
|
push @manpage, $combo;
|
|
$opts{$combo} |= 2;
|
|
}
|
|
}
|
|
}
|
|
close($r);
|
|
|
|
#########################################################################
|
|
# parse the curl code that outputs the curl -h list
|
|
open($r, "<", "$root/src/tool_listhelp.c") or die "no input file";
|
|
my @toolhelp; # store all parsed parameters
|
|
while(<$r>) {
|
|
chomp;
|
|
my $l= $_;
|
|
if(/^ \{ \" *(.*)/) {
|
|
my $str = $1;
|
|
my $combo;
|
|
if($str =~ /^-(.), --([a-z0-9.-]*)/) {
|
|
# figure out the -short, --long combo
|
|
$combo = "-$1, --$2";
|
|
}
|
|
elsif($str =~ /^--([a-z0-9.-]*)/) {
|
|
# figure out the --long name
|
|
$combo = "--$1";
|
|
}
|
|
if($combo) {
|
|
push @toolhelp, $combo;
|
|
$opts{$combo} |= 4;
|
|
}
|
|
}
|
|
}
|
|
close($r);
|
|
|
|
#
|
|
# Now we have three arrays with options to cross-reference.
|
|
|
|
foreach my $o (keys %opts) {
|
|
my $where = $opts{$o};
|
|
|
|
if($where != 7) {
|
|
# this is not in all three places
|
|
$errors++;
|
|
my $exists;
|
|
my $missing;
|
|
if($where & 1) {
|
|
$exists = " tool_getparam.c";
|
|
}
|
|
else {
|
|
$missing = " tool_getparam.c";
|
|
}
|
|
if($where & 2) {
|
|
$exists.= " curl.1";
|
|
}
|
|
else {
|
|
$missing.= " curl.1";
|
|
}
|
|
if($where & 4) {
|
|
$exists .= " tool_listhelp.c";
|
|
}
|
|
else {
|
|
$missing .= " tool_listhelp.c";
|
|
}
|
|
|
|
print STDERR "$o is not in$missing (but in$exists)\n";
|
|
}
|
|
}
|
|
|
|
print STDERR "$errors\n";
|