mirror of
https://github.com/open-goal/jak-project
synced 2026-08-06 09:54:10 -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)
122 lines
3.6 KiB
Bash
Vendored
Generated
122 lines
3.6 KiB
Bash
Vendored
Generated
#!/bin/sh
|
|
|
|
#***************************************************************************
|
|
# _ _ ____ _
|
|
# 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 script remakes a provided curl release and verifies that the newly
|
|
# built version is identical to the original file.
|
|
#
|
|
# Invoke in a clean directory with the release tarball file (stored in the
|
|
# same directory) as an argument for basic verification.
|
|
#
|
|
# For full verification: run the script in an up-to-date curl git repository.
|
|
#
|
|
|
|
set -eu
|
|
|
|
tarball="${1:-}"
|
|
|
|
if [ -z "$tarball" ]; then
|
|
echo "Provide a curl release tarball name as argument"
|
|
exit
|
|
fi
|
|
|
|
i="$(find . -maxdepth 1 -type d -name 'curl-*' | wc -l)"
|
|
|
|
if test "$i" -gt 1; then
|
|
echo "multiple curl-* entries found, disambiguate please"
|
|
exit
|
|
fi
|
|
|
|
# check if this is in a git clone directory
|
|
|
|
if git log -1 include/curl/curl.h 2>/dev/null >/dev/null; then
|
|
echo "*** Detected a git checkout, do full verification"
|
|
withgit=1
|
|
else
|
|
echo "*** Lacking a full git checkout, do the lesser verification"
|
|
withgit=0
|
|
fi
|
|
|
|
mkdir -p _tarballs
|
|
rm -rf _tarballs/*
|
|
|
|
# checksum the original tarball to compare with later
|
|
sha256sum "$tarball" >_tarballs/checksum
|
|
|
|
# extract version number from file name
|
|
tarver=$(echo "$tarball" | sed 's/curl-\([0-9.]*\)\..*/\1/')
|
|
|
|
# extract the version from the official header file
|
|
curlver=$(tar xOf "$tarball" "curl-$tarver/include/curl/curlver.h" | grep '#define LIBCURL_VERSION ' | sed 's/[^0-9.]//g')
|
|
|
|
if test "$tarver" != "$curlver"; then
|
|
echo "Tarball file version ($tarver) mismatches contents of tarball ($curlver)"
|
|
exit 1
|
|
fi
|
|
|
|
timestamp=$(tar xOf "$tarball" "curl-$tarver/docs/RELEASE-TOOLS.md" | grep 'SOURCE_DATE_EPOCH=' | sed 's/[^0-9.]//g')
|
|
|
|
if test "$withgit" = 0; then
|
|
# without git
|
|
|
|
# extract the release contents
|
|
tar xf "$tarball"
|
|
|
|
# move away the original tarball
|
|
mv "$tarball" "_tarballs/orig-$tarball"
|
|
|
|
pwd=$(pwd)
|
|
cd "curl-$curlver"
|
|
./configure --without-ssl --without-libpsl
|
|
./scripts/dmaketgz "$curlver" "$timestamp"
|
|
|
|
for f in "curl-$curlver.tar.gz" "curl-$curlver.tar.bz2" "curl-$curlver.tar.xz" "curl-$curlver.zip"; do
|
|
mv "$f" ../_tarballs/
|
|
done
|
|
cd "$pwd"
|
|
else
|
|
tag=$(tar xOf "$tarball" "curl-$tarver/docs/RELEASE-TOOLS.md" | grep 'tag/commit: curl-' | head -n 1 | sed 's/.*\(curl-[0-9_]*\).*/\1/')
|
|
echo "*** Use git tag $tag"
|
|
|
|
# move away the original tarball
|
|
mv "$tarball" "_tarballs/orig-$tarball"
|
|
|
|
prevtag=$(git symbolic-ref -q --short HEAD || git rev-parse HEAD)
|
|
git checkout -f "$tag"
|
|
|
|
./scripts/dmaketgz "$curlver" "$timestamp"
|
|
|
|
# switch back to where it was
|
|
git checkout -f "$prevtag"
|
|
|
|
for f in "curl-$curlver.tar.gz" "curl-$curlver.tar.bz2" "curl-$curlver.tar.xz" "curl-$curlver.zip"; do
|
|
mv "$f" _tarballs/
|
|
done
|
|
fi
|
|
cd "_tarballs"
|
|
|
|
# compare the new tarball against the original
|
|
sha256sum -c checksum
|