mirror of
https://github.com/open-goal/jak-project
synced 2026-08-20 14:24:45 -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)
154 lines
4.6 KiB
Plaintext
Vendored
Generated
154 lines
4.6 KiB
Plaintext
Vendored
Generated
$! build_curl-config_script.com
|
|
$!
|
|
$! This generates the curl-config. script from the curl-config.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 curl-config. already exists.
|
|
$ if f$search("[--]curl-config.") .nes. "" then goto all_exit
|
|
$!
|
|
$ 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
|
|
$!
|
|
$ x_prefix = "/usr"
|
|
$ x_exec_prefix = "/usr"
|
|
$ x_includedir = "${prefix}/include"
|
|
$ x_cppflag_curl_staticlib = "-DCURL_STATICLIB"
|
|
$ x_enabled_shared = "no"
|
|
$ x_curl_ca_bundle = ""
|
|
$ x_cc = "cc"
|
|
$ x_support_features = "SSL IPv6 libz NTLM"
|
|
$ x_support_protocols1 = "DICT FILE FTP FTPS GOPHER HTTP HTTPS IMAP IMAPS LDAP"
|
|
$ x_support_protocols2 = " LDAPS POP3 POP3S RTSP SMTP SMTPS TELNET TFTP"
|
|
$ x_support_protocols = x_support_protocols1 + x_support_protocols2
|
|
$ x_curlversion = "0.0.0.0"
|
|
$ x_versionnum = ""
|
|
$ x_libdir = "${prefix}/lib"
|
|
$ x_require_lib_deps = ""
|
|
$ x_enable_static = ""
|
|
$ x_ldflags = ""
|
|
$ part1 = "-L/usr/lib -L/SSL_LIB -lssl -lcrypto -lz"
|
|
$ if arch_name .eqs. "VAX"
|
|
$ then
|
|
$ x_libcurl_libs = part1
|
|
$ else
|
|
$ x_libcurl_libs = part1 + " -lgssapi"
|
|
$ endif
|
|
$ x_libext = "a"
|
|
$!
|
|
$! Get the version number
|
|
$!-----------------------
|
|
$ i = 0
|
|
$ open/read/error=version_loop_end vhf [--.include.curl]curlver.h
|
|
$ version_loop:
|
|
$ read/end=version_loop_end vhf line_in
|
|
$ if line_in .eqs. "" then goto version_loop
|
|
$ if f$locate("#define LIBCURL_VERSION ", line_in) .eq. 0
|
|
$ then
|
|
$ x_curlversion = f$element(2," ", line_in) - """" - """"
|
|
$ i = i + 1
|
|
$ endif
|
|
$ if f$locate("#define LIBCURL_VERSION_NUM ", line_in) .eq. 0
|
|
$ then
|
|
$ x_versionnum = f$element(2," ", line_in) - """" - """"
|
|
$ i = i + 1
|
|
$ endif
|
|
$ if i .lt 2 then goto version_loop
|
|
$ version_loop_end:
|
|
$ close vhf
|
|
$!
|
|
$ kit_type = "V"
|
|
$ if f$locate("-", x_curlversion) .lt. f$length(x_curlversion)
|
|
$ then
|
|
$ kit_type = "D"
|
|
$ x_prefix = "/beta"
|
|
$ x_exec_prefix = "/beta"
|
|
$ endif
|
|
$!
|
|
$ if kit_type .nes. "D"
|
|
$ then
|
|
$ part1 = " echo "" '--prefix=/usr' '--exec-prefix=/usr' "
|
|
$ else
|
|
$ part1 = " echo "" '--prefix=/beta' '--exec_prefix=/beta' "
|
|
$ endif
|
|
$ if arch_name .eqs. "VAX"
|
|
$ then
|
|
$ part3 = ""
|
|
$ else
|
|
$ part3 = "'--with-gssapi' "
|
|
$ endif
|
|
$ part2 = "'--disable-dependency-tracking' '--disable-libtool-lock' "
|
|
$ part4 = "'--disable-ntlm-wb' '--with-ca-path=gnv$curl_ca_path'"""
|
|
$!
|
|
$ x_configure_options = part1 + part2 + part3 + part4
|
|
$!
|
|
$!
|
|
$ open/read/error=read_loop_end c_c_in sys$disk:[--]curl-config.in
|
|
$ create sys$disk:[--]curl-config.
|
|
$ open/append c_c_out sys$disk:[--]curl-config.
|
|
$read_loop:
|
|
$ read/end=read_loop_end c_c_in line_in
|
|
$ line_in_len = f$length(line_in)
|
|
$ if f$locate("@", line_in) .ge. line_in_len
|
|
$ then
|
|
$ write c_c_out line_in
|
|
$ goto read_loop
|
|
$ endif
|
|
$ i = 0
|
|
$ line_out = ""
|
|
$sub_loop:
|
|
$ ! Replace between pairs of @ by alternating the elements.
|
|
$ ! If mismatched pairs, do not substitute anything.
|
|
$ section1 = f$element(i, "@", line_in)
|
|
$ if section1 .eqs. "@"
|
|
$ then
|
|
$ goto sub_loop_end
|
|
$ endif
|
|
$ i = i + 1
|
|
$ section2 = f$element(i, "@", line_in)
|
|
$ if section2 .eqs. "@"
|
|
$ then
|
|
$ goto sub_loop_end
|
|
$ endif
|
|
$ i = i + 1
|
|
$ section3 = f$element(i, "@", line_in)
|
|
$ if section3 .eqs. "@"
|
|
$ then
|
|
$ if line_out .eqs. "" then line_out = line_in
|
|
$ goto sub_loop_end
|
|
$ endif
|
|
$ line_out = line_out + section1
|
|
$ if f$type(x_'section2') .eqs. "STRING"
|
|
$ then
|
|
$ line_out = line_out + x_'section2'
|
|
$ endif
|
|
$ goto sub_loop
|
|
$sub_loop_end:
|
|
$ write c_c_out line_out
|
|
$ goto read_loop
|
|
$read_loop_end:
|
|
$ close c_c_in
|
|
$ close c_c_out
|