mirror of
https://github.com/open-goal/jak-project
synced 2026-08-06 18:03:30 -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)
200 lines
5.8 KiB
Perl
Vendored
Generated
200 lines
5.8 KiB
Perl
Vendored
Generated
#!/usr/bin/env perl
|
|
#***************************************************************************
|
|
# _ _ ____ _
|
|
# Project ___| | | | _ \| |
|
|
# / __| | | | |_) | |
|
|
# | (__| |_| | _ <| |___
|
|
# \___|\___/|_| \_\_____|
|
|
#
|
|
# Copyright (C) Daniel Fandrich, 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 is intended for developers to test some internals of the
|
|
# runtests.pl harness. Do not try to use this unless you know what you are
|
|
# doing!
|
|
|
|
# An example command-line that starts a test http server for test 11 and waits
|
|
# for the user before stopping it:
|
|
# ./devtest.pl --verbose serverfortest https echo "Started https" protoport https preprocess 11 pause echo Stopping stopservers echo Done
|
|
# curl can connect to the server while it is running like this:
|
|
# curl -vkL https://localhost:<protoport>/11
|
|
|
|
use strict;
|
|
use warnings;
|
|
use 5.006;
|
|
|
|
BEGIN {
|
|
# Define srcdir to the location of the tests source directory. This is
|
|
# usually set by the Makefile, but for out-of-tree builds with direct
|
|
# invocation of runtests.pl, it may not be set.
|
|
if(!defined $ENV{'srcdir'}) {
|
|
use File::Basename;
|
|
$ENV{'srcdir'} = dirname(__FILE__);
|
|
}
|
|
push(@INC, $ENV{'srcdir'});
|
|
}
|
|
|
|
use globalconfig;
|
|
use servers qw(
|
|
initserverconfig
|
|
protoport
|
|
serverfortest
|
|
stopservers
|
|
);
|
|
use runner qw(
|
|
readtestkeywords
|
|
singletest_preprocess
|
|
);
|
|
use testutil qw(
|
|
setlogfunc
|
|
);
|
|
use getpart;
|
|
|
|
#######################################################################
|
|
# logmsg is our general message logging subroutine.
|
|
# This function is currently required to be here by servers.pm
|
|
# This is copied from runtests.pl
|
|
#
|
|
my $uname_release = qx(uname -r);
|
|
my $is_wsl = $uname_release =~ /Microsoft$/;
|
|
sub logmsg {
|
|
for(@_) {
|
|
my $line = $_;
|
|
if($is_wsl) {
|
|
# use \r\n for WSL shell
|
|
$line =~ s/\r?\n$/\r\n/g;
|
|
}
|
|
print $line;
|
|
}
|
|
}
|
|
|
|
#######################################################################
|
|
# Parse and store the protocols in curl's Protocols: line
|
|
# This is copied from runtests.pl
|
|
#
|
|
sub parseprotocols {
|
|
my ($line)=@_;
|
|
|
|
@protocols = split(' ', lc($line));
|
|
|
|
# Generate a "proto-ipv6" version of each protocol to match the
|
|
# IPv6 <server> name and a "proto-unix" to match the variant which
|
|
# uses Unix domain sockets. This works even if support is not
|
|
# compiled in because the <features> test fails.
|
|
push @protocols, map(("$_-ipv6", "$_-unix"), @protocols);
|
|
|
|
# 'http-proxy' is used in test cases to do CONNECT through
|
|
push @protocols, 'http-proxy';
|
|
|
|
# 'none' is used in test cases to mean no server
|
|
push @protocols, 'none';
|
|
}
|
|
|
|
#######################################################################
|
|
# Initialize @protocols from the curl binary under test
|
|
#
|
|
sub init_protocols {
|
|
for (qx($CURL -V 2>$dev_null)) {
|
|
if(m/^Protocols: (.*)$/) {
|
|
parseprotocols($1);
|
|
}
|
|
}
|
|
}
|
|
|
|
#######################################################################
|
|
# Initialize the test harness to run tests
|
|
#
|
|
sub init_tests {
|
|
setlogfunc(\&logmsg);
|
|
init_protocols();
|
|
initserverconfig();
|
|
}
|
|
|
|
#######################################################################
|
|
# Main test loop
|
|
|
|
init_tests();
|
|
|
|
#***************************************************************************
|
|
# Parse command-line options and commands
|
|
#
|
|
while(@ARGV) {
|
|
if($ARGV[0] eq "-h") {
|
|
print "Usage: devtest.pl [--verbose] [command [arg]...]\n";
|
|
print "command is one of:\n";
|
|
print " echo X\n";
|
|
print " pause\n";
|
|
print " preprocess\n";
|
|
print " protocols *|X[,Y...]\n";
|
|
print " protoport X\n";
|
|
print " serverfortest X[,Y...]\n";
|
|
print " stopservers\n";
|
|
print " sleep N\n";
|
|
exit 0;
|
|
}
|
|
elsif($ARGV[0] eq "--verbose") {
|
|
$verbose = 1;
|
|
}
|
|
elsif($ARGV[0] eq "sleep") {
|
|
shift @ARGV;
|
|
sleep $ARGV[0];
|
|
}
|
|
elsif($ARGV[0] eq "echo") {
|
|
shift @ARGV;
|
|
print $ARGV[0] . "\n";
|
|
}
|
|
elsif($ARGV[0] eq "pause") {
|
|
print "Press Enter to continue: ";
|
|
readline STDIN;
|
|
}
|
|
elsif($ARGV[0] eq "protocols") {
|
|
shift @ARGV;
|
|
if($ARGV[0] eq "*") {
|
|
init_protocols();
|
|
}
|
|
else {
|
|
@protocols = split(",", $ARGV[0]);
|
|
}
|
|
print "Set " . scalar @protocols . " protocols\n";
|
|
}
|
|
elsif($ARGV[0] eq "preprocess") {
|
|
shift @ARGV;
|
|
loadtest("${TESTDIR}/test${ARGV[0]}", 1);
|
|
readtestkeywords();
|
|
singletest_preprocess($ARGV[0]);
|
|
}
|
|
elsif($ARGV[0] eq "protoport") {
|
|
shift @ARGV;
|
|
my $port = protoport($ARGV[0]);
|
|
print "protoport: $port\n";
|
|
}
|
|
elsif($ARGV[0] eq "serverfortest") {
|
|
shift @ARGV;
|
|
my ($why, $e) = serverfortest(split(/,/, $ARGV[0]));
|
|
print "serverfortest: $e $why\n";
|
|
}
|
|
elsif($ARGV[0] eq "stopservers") {
|
|
my $err = stopservers();
|
|
print "stopservers: $err\n";
|
|
}
|
|
else {
|
|
print "Error: Unknown command: $ARGV[0]\n";
|
|
print "Continuing anyway\n";
|
|
}
|
|
shift @ARGV;
|
|
}
|