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)
203 lines
5.4 KiB
Plaintext
Vendored
Generated
203 lines
5.4 KiB
Plaintext
Vendored
Generated
$! File: build_libcurl_pc.com
|
|
$!
|
|
$! Build the libcurl.pc file from the libcurl.pc.in file
|
|
$!
|
|
$! 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
|
|
$!
|
|
$!===========================================================================
|
|
$!
|
|
$! Skip this if the libcurl.pc already exists.
|
|
$ if f$search("[--]libcurl.pc") .nes. "" then goto all_exit
|
|
$!
|
|
$! Need to know the kit type.
|
|
$ 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
|
|
$!
|
|
$!
|
|
$! Parse the kit name into components.
|
|
$!---------------------------------------
|
|
$ producer = f$element(0, "-", kit_name)
|
|
$ base = f$element(1, "-", kit_name)
|
|
$ product = f$element(2, "-", kit_name)
|
|
$ mmversion = f$element(3, "-", kit_name)
|
|
$ majorver = f$extract(0, 3, mmversion)
|
|
$ minorver = f$extract(3, 2, mmversion)
|
|
$ updatepatch = f$element(4, "-", kit_name)
|
|
$ if updatepatch .eqs. "-" then updatepatch = ""
|
|
$!
|
|
$! kit type of "D" means a daily build
|
|
$ kit_type = f$edit(f$extract(0, 1, majorver), "upcase")
|
|
$!
|
|
$ pc_file_in = "[--]libcurl^.pc.in"
|
|
$!
|
|
$ if f$search(pc_file_in) .eqs. ""
|
|
$ then
|
|
$ pc_file_in = "[--]libcurl.pc$5nin"
|
|
$ if f$search(pc_file_in) .eqs. ""
|
|
$ then
|
|
$ pc_file_in = "[--]libcurl.pc_in"
|
|
$ if f$search(pc_file_in) .eqs. ""
|
|
$ then
|
|
$ write sys$output "Can not find libcurl.pc.in."
|
|
$ goto all_exit
|
|
$ endif
|
|
$ endif
|
|
$ endif
|
|
$!
|
|
$ if (f$getsyi("HW_MODEL") .lt. 1024)
|
|
$ then
|
|
$ arch_name = "VAX"
|
|
$ else
|
|
$ arch_name = ""
|
|
$ arch_name = arch_name + f$edit(f$getsyi("ARCH_NAME"), "UPCASE")
|
|
$ if (arch_name .eqs. "") then arch_name = "UNK"
|
|
$ endif
|
|
$!
|
|
$!
|
|
$ curl_version = "0.0.0"
|
|
$ open/read vf [--.src]tool_version.h
|
|
$version_loop:
|
|
$ read vf/end=version_loop_end line_in
|
|
$ if line_in .eqs. "" then goto version_loop
|
|
$ key = f$element(0, " ", line_in)
|
|
$ if key .nes. "#define" then goto version_loop
|
|
$ name = f$element(1, " ", line_in)
|
|
$ if name .eqs. "VERSION"
|
|
$ then
|
|
$ curl_version = f$element(2, " ", line_in) - """" - """"
|
|
$ else
|
|
$ goto version_loop
|
|
$ endif
|
|
$version_loop_end:
|
|
$ close vf
|
|
$!
|
|
$!
|
|
$ create [--]libcurl.pc
|
|
$ open/append pco [--]libcurl.pc
|
|
$ open/read pci 'pc_file_in'
|
|
$pc_file_loop:
|
|
$ read pci/end=pc_file_loop_end line_in
|
|
$!
|
|
$! blank lines
|
|
$ if line_in .eqs. ""
|
|
$ then
|
|
$ write pco ""
|
|
$ goto pc_file_loop
|
|
$ endif
|
|
$!
|
|
$! comment lines
|
|
$ key = f$extract(0, 1, line_in)
|
|
$ if key .eqs. "#"
|
|
$ then
|
|
$ write pco line_in
|
|
$ goto pc_file_loop
|
|
$ endif
|
|
$!
|
|
$! Special handling for libs.
|
|
$ if f$locate("Libs:", line_in) .eq. 0
|
|
$ then
|
|
$ write pco "#",line_in
|
|
$ goto pc_file_loop
|
|
$ endif
|
|
$! No substitution line
|
|
$ line_in_len = f$length(line_in)
|
|
$ if f$locate("@", line_in) .ge. line_in_len
|
|
$ then
|
|
$ write pco line_in
|
|
$ goto pc_file_loop
|
|
$ endif
|
|
$!
|
|
$ if f$locate("@prefix@", line_in) .lt line_in_len
|
|
$ then
|
|
$ if kit_type .nes. "D"
|
|
$ then
|
|
$ write pco "prefix=/usr"
|
|
$ else
|
|
$ write pco "prefix=/beta"
|
|
$ endif
|
|
$ goto pc_file_loop
|
|
$ endif
|
|
$ if f$locate("@exec_prefix@", line_in) .lt line_in_len
|
|
$ then
|
|
$ if kit_type .nes. "D"
|
|
$ then
|
|
$ write pco "exec_prefix=/usr"
|
|
$ else
|
|
$ write pco "exec_prefix=/beta"
|
|
$ endif
|
|
$ goto pc_file_loop
|
|
$ endif
|
|
$ if f$locate("@libdir@", line_in) .lt line_in_len
|
|
$ then
|
|
$ write pco "libdir=$(exec_prefix}/lib"
|
|
$ goto pc_file_loop
|
|
$ endif
|
|
$ if f$locate("@includedir@", line_in) .lt line_in_len
|
|
$ then
|
|
$ write pco "includedir=$(prefix}/include"
|
|
$ goto pc_file_loop
|
|
$ endif
|
|
$ if f$locate("@SUPPORT_PROTOCOLS@", line_in) .lt line_in_len
|
|
$ then
|
|
$ proto1 = "DICT FILE FTP FTPS GOPHER HTTP HTTPS IMAP IMAPS"
|
|
$ proto2 = " LDAP LDAPS POP3 POP3S RTSP SMTP SMTPS TELNET TFTP"
|
|
$ proto = proto1 + proto2
|
|
$ write pco "supported_protocols=""" + proto + """"
|
|
$ goto pc_file_loop
|
|
$ endif
|
|
$ if f$locate("@SUPPORT_FEATURES@", line_in) .lt line_in_len
|
|
$ then
|
|
$ if arch_name .eqs. "VAX"
|
|
$ then
|
|
$ write pco "supported_features=""SSL libz NTLM"""
|
|
$ else
|
|
$ write pco "supported_features=""SSL IPv6 libz NTLM"""
|
|
$ endif
|
|
$ goto pc_file_loop
|
|
$ endif
|
|
$ if f$locate("@CURLVERSION@", line_in) .lt line_in_len
|
|
$ then
|
|
$ write pco "Version: ''curl_version'"
|
|
$ goto pc_file_loop
|
|
$ endif
|
|
$ if f$locate("@LIBCURL_PC_LIBS_PRIVATE@", line_in) .lt line_in_len
|
|
$ then
|
|
$ if arch_name .eqs. "VAX"
|
|
$ then
|
|
$ write pco "Libs.private: -lssl -lcrypto -lz"
|
|
$ else
|
|
$ write pco "Libs.private: -lssl -lcrypto -lgssapi -lz"
|
|
$ endif
|
|
$ goto pc_file_loop
|
|
$ endif
|
|
$ if f$locate("@LIBCURL_PC_CFLAGS@", line_in) .lt line_in_len
|
|
$ then
|
|
$ write pco "Cflags: -I${includedir} -DCURL_STATICLIB"
|
|
$ goto pc_file_loop
|
|
$ endif
|
|
$!
|
|
$pc_file_loop_end:
|
|
$ close pco
|
|
$ close pci
|
|
$!
|
|
$all_exit:
|
|
$ exit
|