mirror of
https://github.com/open-goal/jak-project
synced 2026-08-30 01:20:38 -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)
131 lines
4.1 KiB
Plaintext
Vendored
Generated
131 lines
4.1 KiB
Plaintext
Vendored
Generated
$! File: Backup_gnv_curl_src.com
|
|
$!
|
|
$! Procedure to create backup save sets for installing in a PCSI kit.
|
|
$!
|
|
$! To comply with most Open Source licenses, the source used for building
|
|
$! a kit will be packaged with the distribution kit for the binary.
|
|
$!
|
|
$! Backup save sets are the only storage format that I can expect a
|
|
$! VMS system to be able to extract ODS-5 filenames and directories.
|
|
$!
|
|
$! The make_pcsi_kit_name.com needs to be run before this procedure to
|
|
$! properly name the files that will be created.
|
|
$!
|
|
$! This file is created from a template file for the purpose of making it
|
|
$! easier to port Unix code, particularly open source code to VMS.
|
|
$! Therefore permission is freely granted for any use.
|
|
$!
|
|
$! Copyright (C) John Malmberg
|
|
$!
|
|
$! Permission to use, copy, modify, and/or distribute this software for any
|
|
$! purpose with or without fee is hereby granted, provided that the above
|
|
$! copyright notice and this permission notice appear in all copies.
|
|
$!
|
|
$! THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
$! WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
$! MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
$! ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
$! WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
$! ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
|
|
$! OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
$!
|
|
$! SPDX-License-Identifier: ISC
|
|
$!
|
|
$!===========================================================================
|
|
$!
|
|
$! Save default
|
|
$ default_dir = f$environment("DEFAULT")
|
|
$!
|
|
$ arch_type = f$getsyi("ARCH_NAME")
|
|
$ arch_code = f$extract(0, 1, arch_type)
|
|
$!
|
|
$ if arch_code .nes. "V"
|
|
$ then
|
|
$ set proc/parse=extended
|
|
$ endif
|
|
$!
|
|
$ ss_abort = 44
|
|
$ status = ss_abort
|
|
$!
|
|
$ kit_name = f$trnlnm("GNV_PCSI_KITNAME")
|
|
$ if kit_name .eqs. ""
|
|
$ then
|
|
$ write sys$output "@MAKE_PCSI_CURL_KIT_NAME.COM has not been run."
|
|
$ goto all_exit
|
|
$ endif
|
|
$ producer = f$trnlnm("GNV_PCSI_PRODUCER")
|
|
$ if producer .eqs. ""
|
|
$ then
|
|
$ write sys$output "@MAKE_PCSI_CURL_KIT_NAME.COM has not been run."
|
|
$ goto all_exit
|
|
$ endif
|
|
$ filename_base = f$trnlnm("GNV_PCSI_FILENAME_BASE")
|
|
$ if filename_base .eqs. ""
|
|
$ then
|
|
$ write sys$output "@MAKE_PCSI_CURL_KIT_NAME.COM has not been run."
|
|
$ goto all_exit
|
|
$ endif
|
|
$!
|
|
$ node_swvers = f$getsyi("NODE_SWVERS")
|
|
$ node_swvers_type = f$extract(0, 1, node_swvers)
|
|
$ node_swvers_vers = f$extract(1, f$length(node_swvers), node_swvers)
|
|
$ swvers_maj = f$element(0, ".", node_swvers_vers)
|
|
$ node_swvers_min_update = f$element(1, ".", node_swvers_vers)
|
|
$ swvers_min = f$element(0, "-", node_swvers_min_update)
|
|
$ swvers_update = f$element(1, "-", node_swvers_min_update)
|
|
$!
|
|
$ if swvers_update .eqs. "-" then swvers_update = ""
|
|
$!
|
|
$ vms_vers = f$fao("!2ZB!2ZB!AS", 'swvers_maj', 'swvers_min', swvers_update)
|
|
$!
|
|
$!
|
|
$!
|
|
$! If available make an interchange save set
|
|
$!-------------------------------------------
|
|
$ interchange = ""
|
|
$ if arch_code .eqs. "V"
|
|
$ then
|
|
$ interchange = "/interchange"
|
|
$ endif
|
|
$ if (swvers_maj .ges. "8") .and. (swvers_min .ges. 4)
|
|
$ then
|
|
$ interchange = "/interchange/noconvert"
|
|
$ endif
|
|
$!
|
|
$!
|
|
$! Move to the base directories
|
|
$ set def [--]
|
|
$!
|
|
$! Put things back on error.
|
|
$ on warning then goto all_exit
|
|
$!
|
|
$ current_default = f$environment("DEFAULT")
|
|
$ my_dir = f$parse(current_default,,,"DIRECTORY") - "[" - "<" - ">" - "]"
|
|
$!
|
|
$ src_root = "src_root:"
|
|
$ if f$trnlnm("src_root1") .nes. "" then src_root = "src_root1:"
|
|
$ backup'interchange' 'src_root'[curl...]*.*;0 -
|
|
'filename_base'_original_src.bck/sav
|
|
$ status = $status
|
|
$!
|
|
$! There may be a VMS specific source kit
|
|
$!-----------------------------------------
|
|
$ vms_root = "vms_root:"
|
|
$ if f$trnlnm("vms_root1") .nes. "" then vms_root = "vms_root1:"
|
|
$ files_found = 0
|
|
$ define/user sys$error nl:
|
|
$ define/user sys$output nl:
|
|
$ directory 'vms_root'[...]*.*;*/exc=*.dir
|
|
$ if '$severity' .eq. 1 then files_found = 1
|
|
$!
|
|
$ if files_found .eq. 1
|
|
$ then
|
|
$ backup'interchange' 'vms_root'[curl...]*.*;0 -
|
|
'filename_base'_vms_src.bck/sav
|
|
$ status = $status
|
|
$ endif
|
|
$!
|
|
$all_exit:
|
|
$ set def 'default_dir'
|
|
$ exit
|