mirror of
https://github.com/open-goal/jak-project
synced 2026-08-29 17:12:57 -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)
142 lines
3.5 KiB
Perl
Vendored
Generated
142 lines
3.5 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);
|
|
use allversions;
|
|
|
|
#
|
|
# 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 $error = 0;
|
|
|
|
my $versions = $ARGV[2];
|
|
|
|
my @syms;
|
|
my %manpage;
|
|
my %symadded;
|
|
|
|
our %pastversion;
|
|
|
|
sub checkmanpage {
|
|
my ($m) = @_;
|
|
|
|
open(my $mh, "<", $m);
|
|
my $line = 1;
|
|
my $title;
|
|
my $addedin;
|
|
while(<$mh>) {
|
|
if(/^Title: (.*)/i) {
|
|
$title = $1;
|
|
}
|
|
elsif(/^Added-in: ([an0-9.\/]*)/i) {
|
|
$addedin = $1;
|
|
|
|
if(($addedin ne "n/a") && !$pastversion{$addedin}) {
|
|
print "$m: was added in a never released version: $addedin\n";
|
|
$error++;
|
|
}
|
|
}
|
|
if($addedin && $title) {
|
|
if($manpage{$title}) {
|
|
print "$title is a duplicate symbol in file $m\n";
|
|
$error++;
|
|
}
|
|
$manpage{$title} = $addedin;
|
|
last;
|
|
}
|
|
$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");
|
|
}
|
|
}
|
|
|
|
# get all the past versions
|
|
allversions($versions);
|
|
|
|
scanman_md_dir("$root/docs/libcurl");
|
|
scanman_md_dir("$root/docs/libcurl/opts");
|
|
|
|
open my $s, "<", "$root/docs/libcurl/symbols-in-versions";
|
|
while(<$s>) {
|
|
chomp;
|
|
if(/^(\S+) +([0-9.]*)/) {
|
|
my ($sym, $ver) = ($1, $2);
|
|
push @syms, $sym;
|
|
|
|
$symadded{$sym} = $ver;
|
|
if(!$pastversion{$ver}) {
|
|
printf "SIV: says $sym was added in non-existing %s\n", $ver;
|
|
$error++;
|
|
}
|
|
}
|
|
}
|
|
close $s;
|
|
|
|
my $ignored = 0;
|
|
for my $e (sort @syms) {
|
|
if($manpage{$e}) {
|
|
if($manpage{$e} ne $symadded{$e}) {
|
|
printf "%s.md says version %s, but SIV says %s\n",
|
|
$e, $manpage{$e}, $symadded{$e};
|
|
$error++;
|
|
}
|
|
}
|
|
}
|
|
print "OK\n" if(!$error);
|
|
exit $error;
|