mirror of
https://github.com/open-goal/jak-project
synced 2026-08-20 14:24:45 -04:00
Alexander J. Semenuk
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)
163 lines
3.9 KiB
Perl
Vendored
Generated
163 lines
3.9 KiB
Perl
Vendored
Generated
#!/usr/bin/env perl
|
|
|
|
use strict;
|
|
use warnings;
|
|
|
|
print <<HEAD
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* 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 source code is generated by optiontable.pl - DO NOT EDIT BY HAND */
|
|
|
|
#include "curl_setup.h"
|
|
|
|
#include "easyoptions.h"
|
|
|
|
/* all easy setopt options listed in alphabetical order */
|
|
const struct curl_easyoption Curl_easyopts[] = {
|
|
HEAD
|
|
;
|
|
|
|
my $lastnum = 0;
|
|
|
|
my %opt;
|
|
my %type;
|
|
my @names;
|
|
my %alias;
|
|
|
|
sub add {
|
|
my($optstr, $typestr, $num) = @_;
|
|
my $name;
|
|
# remove all spaces from the type
|
|
$typestr =~ s/ //g;
|
|
my $ext = $typestr;
|
|
|
|
if($optstr =~ /OBSOLETE/) {
|
|
# skip obsolete options
|
|
next;
|
|
}
|
|
|
|
if($optstr =~ /^CURLOPT_(.*)/) {
|
|
$name = $1;
|
|
}
|
|
$ext =~ s/CURLOPTTYPE_//;
|
|
$ext =~ s/CBPOINT/CBPTR/;
|
|
$ext =~ s/POINT\z//;
|
|
$typestr = "CURLOT_$ext";
|
|
|
|
$opt{$name} = $optstr;
|
|
$type{$name} = $typestr;
|
|
push @names, $name;
|
|
if($num < $lastnum) {
|
|
print STDERR "ERROR: $optstr has bad number: $num < $lastnum\n";
|
|
exit 2;
|
|
}
|
|
else {
|
|
$lastnum = $num;
|
|
}
|
|
}
|
|
|
|
my $fl;
|
|
my $file = shift @ARGV;
|
|
open(CURL_H, '<', $file) or die;
|
|
while(<CURL_H>) {
|
|
my $l = $_;
|
|
if($fl) {
|
|
# continued deprecation
|
|
if($l =~ /(.*)\),/) {
|
|
$fl .= $1;
|
|
|
|
# the end
|
|
my @p = split(/, */, $fl);
|
|
add($p[0], $p[1], $p[2]);
|
|
undef $fl;
|
|
}
|
|
else {
|
|
# another line to append
|
|
chomp $l;
|
|
$fl .= $l;
|
|
}
|
|
}
|
|
|
|
if(/^ *CURLOPTDEPRECATED\((.*)/) {
|
|
$fl = $1;
|
|
chomp $fl;
|
|
}
|
|
|
|
if(/^ *CURLOPT\(([^,]*), ([^,]*), (\d+)\)/) {
|
|
my($opt, $type, $num) = ($1, $2, $3);
|
|
add($opt, $type, $num);
|
|
}
|
|
|
|
# alias for an older option
|
|
# old = new
|
|
if(/^#define (CURLOPT_[^ ]*) *(CURLOPT_\S*)/) {
|
|
my ($o, $n) = ($1, $2);
|
|
# skip obsolete ones
|
|
if(($n !~ /OBSOLETE/) && ($o !~ /OBSOLETE/)) {
|
|
$o =~ s/^CURLOPT_//;
|
|
$n =~ s/^CURLOPT_//;
|
|
$alias{$o} = $n;
|
|
push @names, $o;
|
|
}
|
|
}
|
|
}
|
|
close(CURL_H);
|
|
|
|
for my $name (sort @names) {
|
|
my $oname = $name;
|
|
my $a = $alias{$name};
|
|
my $flag = "0";
|
|
if($a) {
|
|
$name = $alias{$name};
|
|
$flag = "CURLOT_FLAG_ALIAS";
|
|
}
|
|
my $o = sprintf(" { \"%s\", %s, %s, %s },\n",
|
|
$oname, $opt{$name}, $type{$name}, $flag);
|
|
if(length($o) < 80) {
|
|
print $o;
|
|
}
|
|
else {
|
|
printf(" { \"%s\", %s,\n %s, %s },\n",
|
|
$oname, $opt{$name}, $type{$name}, $flag);
|
|
}
|
|
}
|
|
|
|
print <<FOOT
|
|
{ NULL, CURLOPT_LASTENTRY, CURLOT_LONG, 0 } /* end of table */
|
|
};
|
|
|
|
#ifdef DEBUGBUILD
|
|
/*
|
|
* Curl_easyopts_check() is a debug-only function that returns non-zero
|
|
* if this source file is not in sync with the options listed in curl/curl.h
|
|
*/
|
|
int Curl_easyopts_check(void)
|
|
{
|
|
return (CURLOPT_LASTENTRY % 10000) != ($lastnum + 1);
|
|
}
|
|
#endif
|
|
FOOT
|
|
;
|