mirror of
https://github.com/open-goal/jak-project
synced 2026-08-20 22:35:07 -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)
216 lines
5.4 KiB
Perl
Vendored
Generated
216 lines
5.4 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
|
|
#
|
|
###########################################################################
|
|
|
|
use strict;
|
|
use warnings;
|
|
|
|
# the DISABLE options that can be set by configure
|
|
my %disable;
|
|
# the DISABLE options that can be set by CMakeLists.txt
|
|
my %disable_cmake;
|
|
# the DISABLE options propagated via curl_config-cmake.h.in
|
|
my %disable_cmake_config_h;
|
|
# the DISABLE options that are used in C files
|
|
my %file;
|
|
# the DISABLE options that are documented
|
|
my %docs;
|
|
|
|
# we may get the directory root pointed out
|
|
my $root = $ARGV[0] || ".";
|
|
my $DOCS = "CURL-DISABLE.md";
|
|
|
|
sub scanconf {
|
|
my ($f) = @_;
|
|
open S, "<$f";
|
|
while(<S>) {
|
|
if(/(CURL_DISABLE_[A-Z0-9_]+)/g) {
|
|
my ($sym) = ($1);
|
|
if(not $sym =~ /^(CURL_DISABLE_TYPECHECK)$/) {
|
|
$disable{$sym} = 1;
|
|
}
|
|
}
|
|
}
|
|
close S;
|
|
}
|
|
|
|
sub scan_configure {
|
|
opendir(my $m, "$root/m4") or die "Cannot opendir $root/m4: $!";
|
|
my @m4 = grep { /\.m4$/ } readdir($m);
|
|
closedir $m;
|
|
scanconf("$root/configure.ac");
|
|
# scan all m4 files too
|
|
for my $e (@m4) {
|
|
scanconf("$root/m4/$e");
|
|
}
|
|
}
|
|
|
|
sub scanconf_cmake {
|
|
my ($hashr, $f) = @_;
|
|
open S, "<$f";
|
|
while(<S>) {
|
|
if(/(CURL_DISABLE_[A-Z0-9_]+)/g) {
|
|
my ($sym) = ($1);
|
|
if(not $sym =~ /^(CURL_DISABLE_INSTALL|CURL_DISABLE_SRP|CURL_DISABLE_TYPECHECK)$/) {
|
|
$hashr->{$sym} = 1;
|
|
}
|
|
}
|
|
}
|
|
close S;
|
|
}
|
|
|
|
sub scan_cmake {
|
|
scanconf_cmake(\%disable_cmake, "$root/CMakeLists.txt");
|
|
}
|
|
|
|
sub scan_cmake_config_h {
|
|
scanconf_cmake(\%disable_cmake_config_h, "$root/lib/curl_config-cmake.h.in");
|
|
}
|
|
|
|
my %whitelisted = (
|
|
'CURL_DISABLE_DEPRECATION' => 1,
|
|
'CURL_DISABLE_TYPECHECK' => 1,
|
|
);
|
|
|
|
sub scan_file {
|
|
my ($source) = @_;
|
|
open F, "<$source";
|
|
while(<F>) {
|
|
while(s/(CURL_DISABLE_[A-Z0-9_]+)//) {
|
|
my ($sym) = ($1);
|
|
|
|
if(!$whitelisted{$sym}) {
|
|
$file{$sym} = $source;
|
|
}
|
|
}
|
|
}
|
|
close F;
|
|
}
|
|
|
|
sub scan_dir {
|
|
my ($dir) = @_;
|
|
opendir(my $dh, $dir) or die "Cannot opendir $dir: $!";
|
|
my @cfiles = grep { /\.[ch]\z/ && -f "$dir/$_" } readdir($dh);
|
|
closedir $dh;
|
|
for my $f (sort @cfiles) {
|
|
scan_file("$dir/$f");
|
|
}
|
|
}
|
|
|
|
sub scan_sources {
|
|
scan_dir("$root/include/curl");
|
|
scan_dir("$root/src");
|
|
scan_dir("$root/lib");
|
|
scan_dir("$root/lib/vtls");
|
|
scan_dir("$root/lib/vauth");
|
|
}
|
|
|
|
sub scan_docs {
|
|
open F, "<$root/docs/$DOCS";
|
|
my $line = 0;
|
|
while(<F>) {
|
|
$line++;
|
|
if(/^## `(CURL_DISABLE_[A-Z0-9_]+)`/g) {
|
|
my ($sym) = ($1);
|
|
if(not $sym =~ /^(CURL_DISABLE_TYPECHECK)$/) {
|
|
$docs{$sym} = $line;
|
|
}
|
|
}
|
|
}
|
|
close F;
|
|
}
|
|
|
|
scan_configure();
|
|
scan_cmake();
|
|
scan_cmake_config_h();
|
|
scan_sources();
|
|
scan_docs();
|
|
|
|
my $error = 0;
|
|
# Check the configure symbols for use in code
|
|
for my $s (sort keys %disable) {
|
|
if(!$file{$s}) {
|
|
printf "Present in configure.ac, not used by code: %s\n", $s;
|
|
$error++;
|
|
}
|
|
if(!$docs{$s}) {
|
|
printf "Present in configure.ac, not documented in $DOCS: %s\n", $s;
|
|
$error++;
|
|
}
|
|
}
|
|
|
|
# Check the CMakeLists.txt symbols for use in code
|
|
for my $s (sort keys %disable_cmake) {
|
|
if(!$file{$s}) {
|
|
printf "Present in CMakeLists.txt, not used by code: %s\n", $s;
|
|
$error++;
|
|
}
|
|
if(!$docs{$s}) {
|
|
printf "Present in CMakeLists.txt, not documented in $DOCS: %s\n", $s;
|
|
$error++;
|
|
}
|
|
}
|
|
|
|
# Check the CMakeLists.txt symbols for use in curl_config-cmake.h.in
|
|
for my $s (sort keys %disable_cmake) {
|
|
if(!$disable_cmake_config_h{$s}) {
|
|
printf "Present in CMakeLists.txt, not propagated via curl_config-cmake.h.in: %s\n", $s;
|
|
$error++;
|
|
}
|
|
}
|
|
|
|
# Check the code symbols for use in configure
|
|
for my $s (sort keys %file) {
|
|
if(!$disable{$s}) {
|
|
printf "Not set by configure: %s (%s)\n", $s, $file{$s};
|
|
$error++;
|
|
}
|
|
if(!$disable_cmake{$s}) {
|
|
printf "Not set by CMakeLists.txt: %s (%s)\n", $s, $file{$s};
|
|
$error++;
|
|
}
|
|
if(!$docs{$s}) {
|
|
printf "Used in code, not documented in $DOCS: %s\n", $s;
|
|
$error++;
|
|
}
|
|
}
|
|
|
|
# Check the documented symbols
|
|
for my $s (sort keys %docs) {
|
|
if(!$disable{$s}) {
|
|
printf "Documented but not in configure: %s\n", $s;
|
|
$error++;
|
|
}
|
|
if(!$disable_cmake{$s}) {
|
|
printf "Documented but not in CMakeLists.txt: %s\n", $s;
|
|
$error++;
|
|
}
|
|
if(!$file{$s}) {
|
|
printf "Documented, but not used by code: %s\n", $s;
|
|
$error++;
|
|
}
|
|
}
|
|
|
|
exit $error;
|