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)
289 lines
9.5 KiB
Perl
Vendored
Generated
289 lines
9.5 KiB
Perl
Vendored
Generated
#***************************************************************************
|
|
# _ _ ____ _
|
|
# 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 perl module contains functions useful in writing test servers.
|
|
|
|
package serverhelp;
|
|
|
|
use strict;
|
|
use warnings;
|
|
|
|
use Time::HiRes;
|
|
|
|
BEGIN {
|
|
use base qw(Exporter);
|
|
|
|
our @EXPORT_OK = qw(
|
|
logmsg
|
|
$logfile
|
|
serverfactors
|
|
servername_id
|
|
servername_str
|
|
servername_canon
|
|
server_pidfilename
|
|
server_portfilename
|
|
server_logfilename
|
|
server_cmdfilename
|
|
server_inputfilename
|
|
server_outputfilename
|
|
server_exe
|
|
server_exe_args
|
|
mainsockf_pidfilename
|
|
mainsockf_logfilename
|
|
datasockf_pidfilename
|
|
datasockf_logfilename
|
|
);
|
|
}
|
|
|
|
use globalconfig;
|
|
use pathhelp qw(
|
|
exe_ext
|
|
);
|
|
use testutil qw(
|
|
exerunner
|
|
);
|
|
|
|
our $logfile; # server log filename, for logmsg
|
|
|
|
#***************************************************************************
|
|
# For convenience, test harness uses 'https' and 'httptls' literals as
|
|
# values for 'proto' variable in order to differentiate different servers.
|
|
# 'https' literal is used for stunnel based https test servers, and 'httptls'
|
|
# is used for non-stunnel https test servers.
|
|
|
|
#**********************************************************************
|
|
# logmsg is general message logging subroutine for our test servers.
|
|
#
|
|
sub logmsg {
|
|
my ($seconds, $usec) = Time::HiRes::gettimeofday();
|
|
my ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) = localtime($seconds);
|
|
my $now = sprintf("%02d:%02d:%02d.%06d ", $hour, $min, $sec, $usec);
|
|
# we see warnings on Windows run that $logfile is used uninitialized
|
|
# TODO: not found yet where this comes from
|
|
$logfile = "serverhelp_uninitialized.log" if(!$logfile);
|
|
if(open(my $logfilefh, ">>", $logfile)) {
|
|
print $logfilefh $now;
|
|
print $logfilefh @_;
|
|
close($logfilefh);
|
|
}
|
|
}
|
|
|
|
#***************************************************************************
|
|
# Return server characterization factors given a server id string.
|
|
#
|
|
sub serverfactors {
|
|
my $server = $_[0];
|
|
my $proto;
|
|
my $ipvnum;
|
|
my $idnum;
|
|
|
|
if($server =~
|
|
/^((ftp|http|imap|pop3|smtp)s?)(\d*)(-ipv6|)$/) {
|
|
$proto = $1;
|
|
$idnum = ($3 && ($3 > 1)) ? $3 : 1;
|
|
$ipvnum = ($4 && ($4 =~ /6$/)) ? 6 : 4;
|
|
}
|
|
elsif($server =~
|
|
/^(dns|tftp|sftp|socks|ssh|rtsp|gopher|httptls)(\d*)(-ipv6|)$/) {
|
|
$proto = $1;
|
|
$idnum = ($2 && ($2 > 1)) ? $2 : 1;
|
|
$ipvnum = ($3 && ($3 =~ /6$/)) ? 6 : 4;
|
|
}
|
|
else {
|
|
die "invalid server id: '$server'"
|
|
}
|
|
return($proto, $ipvnum, $idnum);
|
|
}
|
|
|
|
#***************************************************************************
|
|
# Return server name string formatted for presentation purposes
|
|
#
|
|
sub servername_str {
|
|
my ($proto, $ipver, $idnum) = @_;
|
|
|
|
$proto = uc($proto) if($proto);
|
|
die "unsupported protocol: '$proto'" unless($proto &&
|
|
($proto =~ /^(((DNS|FTP|HTTP|HTTP\/2|HTTP\/3|IMAP|POP3|GOPHER|SMTP|HTTPS-MTLS)S?)|(TFTP|SFTP|SOCKS|SSH|RTSP|HTTPTLS|DICT|SMB|SMBS|TELNET|MQTT|MQTTS))$/));
|
|
|
|
$ipver = (not $ipver) ? 'ipv4' : lc($ipver);
|
|
die "unsupported IP version: '$ipver'" unless($ipver &&
|
|
($ipver =~ /^(4|6|ipv4|ipv6|-ipv4|-ipv6|unix)$/));
|
|
$ipver = ($ipver =~ /6$/) ? '-IPv6' : (($ipver =~ /unix$/) ? '-unix' : '');
|
|
|
|
$idnum = 1 if(not $idnum);
|
|
die "unsupported ID number: '$idnum'" unless($idnum &&
|
|
($idnum =~ /^(\d+)$/));
|
|
$idnum = '' if($idnum <= 1);
|
|
|
|
return "${proto}${idnum}${ipver}";
|
|
}
|
|
|
|
#***************************************************************************
|
|
# Return server name string formatted for identification purposes
|
|
#
|
|
sub servername_id {
|
|
my ($proto, $ipver, $idnum) = @_;
|
|
return lc(servername_str($proto, $ipver, $idnum));
|
|
}
|
|
|
|
#***************************************************************************
|
|
# Return server name string formatted for filename purposes
|
|
#
|
|
sub servername_canon {
|
|
my ($proto, $ipver, $idnum) = @_;
|
|
my $string = lc(servername_str($proto, $ipver, $idnum));
|
|
$string =~ tr/-/_/;
|
|
$string =~ s/\//_v/;
|
|
return $string;
|
|
}
|
|
|
|
#***************************************************************************
|
|
# Return filename for server pid file.
|
|
#
|
|
sub server_pidfilename {
|
|
my ($piddir, $proto, $ipver, $idnum) = @_;
|
|
my $trailer = '_server.pid';
|
|
return "${piddir}/". servername_canon($proto, $ipver, $idnum) . $trailer;
|
|
}
|
|
|
|
#***************************************************************************
|
|
# Return filename for server port file.
|
|
#
|
|
sub server_portfilename {
|
|
my ($piddir, $proto, $ipver, $idnum) = @_;
|
|
my $trailer = '_server.port';
|
|
return "${piddir}/". servername_canon($proto, $ipver, $idnum) . $trailer;
|
|
}
|
|
|
|
#***************************************************************************
|
|
# Return filename for server log file.
|
|
#
|
|
sub server_logfilename {
|
|
my ($logdir, $proto, $ipver, $idnum) = @_;
|
|
my $trailer = '_server.log';
|
|
$trailer = '_stunnel.log' if(lc($proto) =~ /^(ftp|http|imap|pop3|smtp)s$/);
|
|
return "${logdir}/". servername_canon($proto, $ipver, $idnum) . $trailer;
|
|
}
|
|
|
|
#***************************************************************************
|
|
# Return filename for server commands file.
|
|
#
|
|
sub server_cmdfilename {
|
|
my ($logdir, $proto, $ipver, $idnum) = @_;
|
|
my $trailer = '_server.cmd';
|
|
return "${logdir}/". servername_canon($proto, $ipver, $idnum) . $trailer;
|
|
}
|
|
|
|
#***************************************************************************
|
|
# Return filename for server input file.
|
|
#
|
|
sub server_inputfilename {
|
|
my ($logdir, $proto, $ipver, $idnum) = @_;
|
|
my $trailer = '_server.input';
|
|
return "${logdir}/". servername_canon($proto, $ipver, $idnum) . $trailer;
|
|
}
|
|
|
|
#***************************************************************************
|
|
# Return filename for server output file.
|
|
#
|
|
sub server_outputfilename {
|
|
my ($logdir, $proto, $ipver, $idnum) = @_;
|
|
my $trailer = '_server.output';
|
|
return "${logdir}/". servername_canon($proto, $ipver, $idnum) . $trailer;
|
|
}
|
|
|
|
#***************************************************************************
|
|
# Return filename for a server executable
|
|
#
|
|
sub server_exe {
|
|
my ($name, $ext) = @_;
|
|
if(!defined $ext) {
|
|
$ext = 'SRV';
|
|
}
|
|
return exerunner() . $SRVDIR . "servers" . exe_ext($ext) . " $name";
|
|
}
|
|
|
|
#***************************************************************************
|
|
# Return filename for a server executable as an argument list
|
|
#
|
|
sub server_exe_args {
|
|
my ($name, $ext) = @_;
|
|
if(!defined $ext) {
|
|
$ext = 'SRV';
|
|
}
|
|
my @cmd = ($SRVDIR . "servers" . exe_ext($ext), $name);
|
|
if($ENV{'CURL_TEST_EXE_RUNNER'}) {
|
|
unshift @cmd, $ENV{'CURL_TEST_EXE_RUNNER'};
|
|
}
|
|
return @cmd;
|
|
}
|
|
|
|
#***************************************************************************
|
|
# Return filename for main or primary sockfilter pid file.
|
|
#
|
|
sub mainsockf_pidfilename {
|
|
my ($piddir, $proto, $ipver, $idnum) = @_;
|
|
die "unsupported protocol: '$proto'" unless($proto &&
|
|
(lc($proto) =~ /^(ftp|imap|pop3|smtp)s?$/));
|
|
my $trailer = (lc($proto) =~ /^ftps?$/) ? '_sockctrl.pid' : '_sockfilt.pid';
|
|
return "${piddir}/". servername_canon($proto, $ipver, $idnum) . $trailer;
|
|
}
|
|
|
|
#***************************************************************************
|
|
# Return filename for main or primary sockfilter log file.
|
|
#
|
|
sub mainsockf_logfilename {
|
|
my ($logdir, $proto, $ipver, $idnum) = @_;
|
|
die "unsupported protocol: '$proto'" unless($proto &&
|
|
(lc($proto) =~ /^(ftp|imap|pop3|smtp)s?$/));
|
|
my $trailer = (lc($proto) =~ /^ftps?$/) ? '_sockctrl.log' : '_sockfilt.log';
|
|
return "${logdir}/". servername_canon($proto, $ipver, $idnum) . $trailer;
|
|
}
|
|
|
|
#***************************************************************************
|
|
# Return filename for data or secondary sockfilter pid file.
|
|
#
|
|
sub datasockf_pidfilename {
|
|
my ($piddir, $proto, $ipver, $idnum) = @_;
|
|
die "unsupported protocol: '$proto'" unless($proto &&
|
|
(lc($proto) =~ /^ftps?$/));
|
|
my $trailer = '_sockdata.pid';
|
|
return "${piddir}/". servername_canon($proto, $ipver, $idnum) . $trailer;
|
|
}
|
|
|
|
#***************************************************************************
|
|
# Return filename for data or secondary sockfilter log file.
|
|
#
|
|
sub datasockf_logfilename {
|
|
my ($logdir, $proto, $ipver, $idnum) = @_;
|
|
die "unsupported protocol: '$proto'" unless($proto &&
|
|
(lc($proto) =~ /^ftps?$/));
|
|
my $trailer = '_sockdata.log';
|
|
return "${logdir}/". servername_canon($proto, $ipver, $idnum) . $trailer;
|
|
}
|
|
|
|
#***************************************************************************
|
|
# End of library
|
|
1;
|