mirror of
https://github.com/open-goal/jak-project
synced 2026-08-07 02:06:59 -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)
215 lines
6.6 KiB
Perl
Vendored
Generated
215 lines
6.6 KiB
Perl
Vendored
Generated
###########################################################################
|
|
# _ _ ____ _
|
|
# Project ___| | | | _ \| |
|
|
# / __| | | | |_) | |
|
|
# | (__| |_| | _ <| |___
|
|
# \___|\___/|_| \_\_____|
|
|
#
|
|
# Copyright (C) Evgeny Grin (Karlson2k), <k2k@narod.ru>.
|
|
#
|
|
# 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 package helps with path transforming when running curl tests on
|
|
# native Windows and MSYS/Cygwin.
|
|
# Following input formats are supported (via built-in Perl functions):
|
|
# (1) /some/path - absolute path in POSIX-style
|
|
# (2) D:/some/path - absolute path in Windows-style
|
|
# (3) some/path - relative path
|
|
# (4) D:some/path - path relative to current directory on Windows drive
|
|
# (paths like 'D:' are treated as 'D:./') (*)
|
|
# (5) \some/path - path from root directory on current Windows drive (*)
|
|
# All forward '/' and back '\' slashes are treated identically except leading
|
|
# slash in forms (1) and (5).
|
|
# Forward slashes are simpler processed in Perl, do not require extra escaping
|
|
# for shell (unlike back slashes) and accepted by Windows native programs, so
|
|
# all functions return paths with only forward slashes.
|
|
# All returned paths do not contain any duplicated slashes, only single slashes
|
|
# are used as directory separators on output.
|
|
# On non-Windows platforms functions acts as transparent wrappers for similar
|
|
# Perl's functions or return unmodified string (depending on functionality),
|
|
# so all functions can be unconditionally used on all platforms.
|
|
#
|
|
# (*) CAUTION! Forms (4) and (5) are not recommended to use as they can be
|
|
# interpreted incorrectly in Perl and MSYS/Cygwin environment have low
|
|
# control on Windows current drive and Windows current path on specific
|
|
# drive.
|
|
|
|
package pathhelp;
|
|
|
|
use strict;
|
|
use warnings;
|
|
use File::Spec;
|
|
|
|
BEGIN {
|
|
use base qw(Exporter);
|
|
|
|
our @EXPORT_OK = qw(
|
|
os_is_win
|
|
exe_ext
|
|
dirsepadd
|
|
shell_quote
|
|
sys_native_abs_path
|
|
sys_native_current_path
|
|
build_sys_abs_path
|
|
);
|
|
}
|
|
|
|
#######################################################################
|
|
# Block for cached static variables
|
|
#
|
|
{
|
|
# Cached static variable, Perl 5.0-compatible.
|
|
my $is_win = $^O eq 'MSWin32' ||
|
|
$^O eq 'cygwin' ||
|
|
$^O eq 'msys';
|
|
|
|
# Returns boolean true if OS is any form of Windows.
|
|
sub os_is_win {
|
|
return $is_win;
|
|
}
|
|
|
|
# Cached static variable, Perl 5.0-compatible.
|
|
my $cygdrive_present;
|
|
|
|
# Returns boolean true if Windows drives mounted with '/cygdrive/' prefix.
|
|
sub drives_mounted_on_cygdrive {
|
|
return $cygdrive_present if defined $cygdrive_present;
|
|
$cygdrive_present = ((-e '/cygdrive/') && (-d '/cygdrive/')) ? 1 : 0;
|
|
return $cygdrive_present;
|
|
}
|
|
}
|
|
|
|
#######################################################################
|
|
# Returns current working directory in Windows format on Windows.
|
|
#
|
|
sub sys_native_current_path {
|
|
return Cwd::getcwd() if !os_is_win();
|
|
|
|
my $cur_dir;
|
|
if($^O eq 'MSWin32') {
|
|
$cur_dir = Cwd::getcwd();
|
|
}
|
|
else {
|
|
$cur_dir = Cygwin::posix_to_win_path(Cwd::getcwd());
|
|
}
|
|
$cur_dir =~ s{[/\\]+}{/}g;
|
|
return $cur_dir;
|
|
}
|
|
|
|
#######################################################################
|
|
# Converts given path to system native absolute path, i.e. to Windows
|
|
# absolute format on Windows platform. Both relative and absolute
|
|
# formats are supported for input.
|
|
#
|
|
sub sys_native_abs_path {
|
|
my ($path) = @_;
|
|
|
|
# Return untouched on non-Windows platforms.
|
|
return File::Spec->rel2abs($path) if !os_is_win();
|
|
|
|
# Do not process empty path.
|
|
return $path if($path eq '');
|
|
|
|
my $res;
|
|
if($^O eq 'msys' || $^O eq 'cygwin') {
|
|
$res = Cygwin::posix_to_win_path(File::Spec->rel2abs($path));
|
|
}
|
|
elsif($path =~ m{^/(cygdrive/)?([a-z])/(.*)}) {
|
|
$res = uc($2) . ":/" . $3;
|
|
}
|
|
else {
|
|
$res = File::Spec->rel2abs($path);
|
|
}
|
|
|
|
$res =~ s{[/\\]+}{/}g;
|
|
return $res;
|
|
}
|
|
|
|
#######################################################################
|
|
# Converts given path to build system format absolute path, i.e. to
|
|
# MSYS/Cygwin POSIX-style absolute format on Windows platform. Both
|
|
# relative and absolute formats are supported for input.
|
|
#
|
|
sub build_sys_abs_path {
|
|
my ($path) = @_;
|
|
|
|
# Return untouched on non-Windows platforms.
|
|
return File::Spec->rel2abs($path) if !os_is_win();
|
|
|
|
my $res;
|
|
if($^O eq 'msys' || $^O eq 'cygwin') {
|
|
$res = Cygwin::win_to_posix_path($path, 1);
|
|
}
|
|
else {
|
|
$res = File::Spec->rel2abs($path);
|
|
|
|
if($res =~ m{^([A-Za-z]):(.*)}) {
|
|
$res = "/" . lc($1) . $2;
|
|
$res = '/cygdrive' . $res if(drives_mounted_on_cygdrive());
|
|
}
|
|
}
|
|
|
|
return $res;
|
|
}
|
|
|
|
#***************************************************************************
|
|
# Return file extension for executable files on this operating system
|
|
#
|
|
sub exe_ext {
|
|
my ($component, @arr) = @_;
|
|
if($ENV{'CURL_TEST_EXE_EXT'}) {
|
|
return $ENV{'CURL_TEST_EXE_EXT'};
|
|
}
|
|
if($ENV{'CURL_TEST_EXE_EXT_' . $component}) {
|
|
return $ENV{'CURL_TEST_EXE_EXT_' . $component};
|
|
}
|
|
if($^O eq 'MSWin32' || $^O eq 'cygwin' || $^O eq 'msys' ||
|
|
$^O eq 'dos' || $^O eq 'os2') {
|
|
return '.exe';
|
|
}
|
|
return '';
|
|
}
|
|
|
|
#***************************************************************************
|
|
# Add ending slash if missing
|
|
#
|
|
sub dirsepadd {
|
|
my ($dir) = @_;
|
|
$dir =~ s/\/$//;
|
|
return $dir . '/';
|
|
}
|
|
|
|
#######################################################################
|
|
# Quote an argument for passing safely to a Bourne shell
|
|
# This does the same thing as String::ShellQuote but does not need a package.
|
|
#
|
|
sub shell_quote {
|
|
my ($s) = @_;
|
|
if($^O eq 'MSWin32') {
|
|
$s = '"' . $s . '"';
|
|
}
|
|
else {
|
|
if($s !~ m/^[-+=.,_\/:a-zA-Z0-9]+$/) {
|
|
# string contains a "dangerous" character--quote it
|
|
$s =~ s/'/'"'"'/g;
|
|
$s = "'" . $s . "'";
|
|
}
|
|
}
|
|
return $s;
|
|
}
|
|
|
|
1; # End of module
|