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)
248 lines
6.6 KiB
Perl
Vendored
Generated
248 lines
6.6 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
|
|
#
|
|
###########################################################################
|
|
#
|
|
# This script grew out of help from Przemyslaw Iskra and Balint Szilakszi
|
|
# a late evening in the #curl IRC channel.
|
|
#
|
|
|
|
use strict;
|
|
use warnings;
|
|
use vars qw($Cpreprocessor);
|
|
|
|
#
|
|
# configurehelp perl module is generated by configure script
|
|
#
|
|
my $rc = eval {
|
|
require configurehelp;
|
|
configurehelp->import(qw(
|
|
$Cpreprocessor
|
|
));
|
|
1;
|
|
};
|
|
# Set default values if configure has not generated a configurehelp.pm file.
|
|
# This is the case with cmake.
|
|
if(!$rc) {
|
|
$Cpreprocessor = 'cpp';
|
|
}
|
|
|
|
# we may get the directory root pointed out
|
|
my $root = $ARGV[0] || ".";
|
|
|
|
# need an include directory when building out-of-tree
|
|
my $i = ($ARGV[1]) ? "-I$ARGV[1] " : '';
|
|
|
|
my $verbose = 0;
|
|
my $summary = 0;
|
|
my $misses = 0;
|
|
|
|
my @manrefs;
|
|
my @syms;
|
|
my %doc;
|
|
my %rem;
|
|
|
|
# scanenum runs the preprocessor on curl.h so it processes all enums
|
|
# included by it, which *should* be all headers
|
|
sub scanenum {
|
|
my ($file) = @_;
|
|
open my $h_in, "-|", "$Cpreprocessor $i$file" or die "Cannot preprocess $file";
|
|
while(<$h_in>) {
|
|
if(/enum\s+(\S+\s+)?{/ .. /}/) {
|
|
s/^\s+//;
|
|
next unless /^CURL/;
|
|
chomp;
|
|
s/[,\s].*//;
|
|
push @syms, $_;
|
|
}
|
|
}
|
|
close $h_in or die "Error preprocessing $file";
|
|
}
|
|
|
|
sub scanheader {
|
|
my ($f) = @_;
|
|
open(my $h, "<", $f);
|
|
while(<$h>) {
|
|
if(/^#define ((LIB|)CURL[A-Za-z0-9_]*)/) {
|
|
push @syms, $1;
|
|
}
|
|
}
|
|
close $h;
|
|
}
|
|
|
|
sub scanallheaders {
|
|
my $d = "$root/include/curl";
|
|
opendir(my $dh, $d) or die "Cannot opendir: $!";
|
|
my @headers = grep { /.h\z/ } readdir($dh);
|
|
closedir $dh;
|
|
foreach my $h (@headers) {
|
|
scanenum("$d/$h");
|
|
scanheader("$d/$h");
|
|
}
|
|
}
|
|
|
|
sub checkmanpage {
|
|
my ($m) = @_;
|
|
|
|
# detect global-looking 'CURL[BLABLA]_*' symbols
|
|
my $global_pat = '\W(CURL(AUTH|E|H|MOPT|OPT|SHOPT|UE|M|SSH|SSLBACKEND|HEADER|FORM|FTP|PIPE|MIMEOPT|GSSAPI|' .
|
|
'ALTSVC|PROTO|PROXY|UPART|USESSL|_READFUNC|_WRITEFUNC|_CSELECT|_FORMADD|_IPRESOLVE|_REDIR|_RTSPREQ|'.
|
|
'_TIMECOND|_VERSION)_[a-zA-Z0-9_]+)';
|
|
my $global_re = qr/$global_pat/;
|
|
|
|
open(my $mh, "<", $m);
|
|
my $line = 1;
|
|
while(<$mh>) {
|
|
# strip off formatting
|
|
$_ =~ s/(^|[^A-Z0-9])[*_]+/ /;
|
|
while(s/$global_re//) {
|
|
my $s = $1;
|
|
# skip two "special" ones
|
|
if($s !~ /(^(CURLE_OBSOLETE|CURLOPT_TEMPLATE))|_$/) {
|
|
push @manrefs, "$s:$m:$line";
|
|
}
|
|
}
|
|
$line++;
|
|
}
|
|
close($mh);
|
|
}
|
|
|
|
sub scanman_md_dir {
|
|
my ($d) = @_;
|
|
opendir(my $dh, $d) or die "Cannot opendir: $!";
|
|
my @mans = grep { /.md\z/ } readdir($dh);
|
|
closedir $dh;
|
|
for my $m (@mans) {
|
|
checkmanpage("$d/$m");
|
|
}
|
|
}
|
|
|
|
scanallheaders();
|
|
scanman_md_dir("$root/docs/libcurl");
|
|
scanman_md_dir("$root/docs/libcurl/opts");
|
|
|
|
open(my $s, "<", "$root/docs/libcurl/symbols-in-versions");
|
|
while(<$s>) {
|
|
if(/(^[^ \n]+) +(.*)/) {
|
|
my ($sym, $rest) = ($1, $2);
|
|
if($doc{$sym}) {
|
|
print "Detected duplicate symbol: $sym\n";
|
|
$misses++;
|
|
next;
|
|
}
|
|
$doc{$sym} = $sym;
|
|
my @a = split(/ +/, $rest);
|
|
if($a[2]) {
|
|
# this symbol is documented to have been present the last time
|
|
# in this release
|
|
$rem{$sym} = $a[2];
|
|
}
|
|
}
|
|
}
|
|
close $s;
|
|
|
|
my $ignored = 0;
|
|
for my $e (sort @syms) {
|
|
# OBSOLETE - names that are placeholders for a position where we
|
|
# previously had a name, that is now removed. The OBSOLETE names should
|
|
# never be used for anything.
|
|
#
|
|
# CURL_EXTERN - is a define used for libcurl functions that are external,
|
|
# public. No app or other code should ever use it.
|
|
#
|
|
# CURLINC_ - defines for header dual-include prevention, ignore those.
|
|
#
|
|
# CURL_TEMP_ - are defined and *undefined* again within the file
|
|
#
|
|
# *_LAST and *_LASTENTRY are suffix for the placeholders used for the
|
|
# last entry in many enum series.
|
|
#
|
|
|
|
if($e =~ /(OBSOLETE|CURLE_RESERVED|^CURL_EXTERN|^CURLINC_|_LAST\z|_LASTENTRY\z|^CURL_TEMP_)/) {
|
|
$ignored++;
|
|
next;
|
|
}
|
|
if($doc{$e}) {
|
|
if($verbose) {
|
|
print $e."\n";
|
|
}
|
|
$doc{$e} = "used";
|
|
next;
|
|
}
|
|
else {
|
|
print $e."\n";
|
|
$misses++;
|
|
}
|
|
}
|
|
|
|
#
|
|
# now scan through all symbols that were present in the symbols-in-versions
|
|
# but not in the headers
|
|
#
|
|
# If the symbols were marked 'removed' in symbols-in-versions we do not output
|
|
# anything about it since that is perfectly fine.
|
|
#
|
|
|
|
my $anyremoved;
|
|
|
|
for my $e (sort keys %doc) {
|
|
if(($doc{$e} ne "used") && !$rem{$e}) {
|
|
|
|
if(!$anyremoved++) {
|
|
print "Missing symbols mentioned in symbols-in-versions\n";
|
|
print "Add them to a header, or mark them as removed.\n";
|
|
}
|
|
|
|
print "$e\n";
|
|
$misses++;
|
|
}
|
|
}
|
|
|
|
my %warned;
|
|
for my $r (@manrefs) {
|
|
if($r =~ /^([^:]+):(.*)/) {
|
|
my ($sym, $file) = ($1, $2);
|
|
if(!$doc{$sym} && !$warned{$sym, $file}) {
|
|
print "$file: $sym is not a public symbol\n";
|
|
$warned{$sym, $file} = 1;
|
|
}
|
|
}
|
|
}
|
|
|
|
if($summary) {
|
|
print "Summary:\n";
|
|
printf "%d symbols in headers (out of which %d are ignored)\n", scalar(@syms),
|
|
$ignored;
|
|
printf "%d symbols in headers are interesting\n",
|
|
scalar(@syms)- $ignored;
|
|
printf "%d symbols are listed in symbols-in-versions\n (out of which %d are listed as removed)\n", scalar(keys %doc), scalar(keys %rem);
|
|
printf "%d symbols in symbols-in-versions should match the ones in headers\n", scalar(keys %doc) - scalar(keys %rem);
|
|
}
|
|
|
|
if($misses) {
|
|
exit 0; # there are stuff to attend to!
|
|
}
|
|
else {
|
|
print "OK\n";
|
|
}
|