mirror of
https://github.com/open-goal/jak-project
synced 2026-08-21 23:00: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)
182 lines
5.9 KiB
Bash
Vendored
Generated
182 lines
5.9 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
|
|
#
|
|
###########################################################################
|
|
#
|
|
# libcurl compilation script for the OS/400.
|
|
#
|
|
|
|
SCRIPTDIR=$(dirname "${0}")
|
|
. "${SCRIPTDIR}/initscript.sh"
|
|
cd "${TOPDIR}/lib" || exit 1
|
|
|
|
# Need to have IFS access to the mih/cipher header file.
|
|
|
|
if action_needed cipher.mih '/QSYS.LIB/QSYSINC.LIB/MIH.FILE/CIPHER.MBR'
|
|
then rm -f cipher.mih
|
|
ln -s '/QSYS.LIB/QSYSINC.LIB/MIH.FILE/CIPHER.MBR' cipher.mih
|
|
fi
|
|
|
|
|
|
# Create and compile the identification source file.
|
|
|
|
{
|
|
echo '#pragma comment(user, "libcurl version '"${LIBCURL_VERSION}"'")'
|
|
echo '#pragma comment(user, __DATE__)'
|
|
echo '#pragma comment(user, __TIME__)'
|
|
echo '#pragma comment(copyright, "Copyright (C) Daniel Stenberg et al. OS/400 version by P. Monnerat")'
|
|
} > os400.c
|
|
make_module OS400 os400.c BUILDING_LIBCURL
|
|
LINK= # No need to rebuild service program yet.
|
|
MODULES=
|
|
|
|
|
|
# Get source list (CSOURCES variable).
|
|
|
|
get_make_vars Makefile.inc
|
|
|
|
|
|
# Compile the sources into modules.
|
|
|
|
# shellcheck disable=SC2034
|
|
INCLUDES="'$(pwd)'"
|
|
|
|
make_module OS400SYS "${SCRIPTDIR}/os400sys.c" BUILDING_LIBCURL
|
|
make_module CCSIDCURL "${SCRIPTDIR}/ccsidcurl.c" BUILDING_LIBCURL
|
|
|
|
for SRC in ${CSOURCES}
|
|
do MODULE=$(db2_name "${SRC}")
|
|
make_module "${MODULE}" "${SRC}" BUILDING_LIBCURL
|
|
done
|
|
|
|
|
|
# If needed, (re)create the static binding directory.
|
|
|
|
if action_needed "${LIBIFSNAME}/${STATBNDDIR}.BNDDIR"
|
|
then LINK=YES
|
|
fi
|
|
|
|
if [ -n "${LINK}" ]
|
|
then rm -rf "${LIBIFSNAME}/${STATBNDDIR}.BNDDIR"
|
|
CMD="CRTBNDDIR BNDDIR(${TARGETLIB}/${STATBNDDIR})"
|
|
CMD="${CMD} TEXT('libcurl API static binding directory')"
|
|
CLcommand "${CMD}"
|
|
|
|
for MODULE in ${MODULES}
|
|
do CMD="ADDBNDDIRE BNDDIR(${TARGETLIB}/${STATBNDDIR})"
|
|
CMD="${CMD} OBJ((${TARGETLIB}/${MODULE} *MODULE))"
|
|
CLcommand "${CMD}"
|
|
done
|
|
fi
|
|
|
|
|
|
# The exportation file for service program creation must be in a DB2
|
|
# source file, so make sure it exists.
|
|
|
|
if action_needed "${LIBIFSNAME}/TOOLS.FILE"
|
|
then CMD="CRTSRCPF FILE(${TARGETLIB}/TOOLS) RCDLEN(112)"
|
|
CMD="${CMD} TEXT('curl: build tools')"
|
|
CLcommand "${CMD}"
|
|
fi
|
|
|
|
|
|
# Gather the list of symbols to export.
|
|
# - Unfold lines from the header files so that they contain a semicolon.
|
|
# - Keep only CURL_EXTERN definitions.
|
|
# - Remove the CURL_DEPRECATED and CURL_TEMP_PRINTF macro calls.
|
|
# - Drop the parenthesized function arguments and what follows.
|
|
# - Keep the trailing function name only.
|
|
|
|
EXPORTS=$(cat "${TOPDIR}"/include/curl/*.h "${SCRIPTDIR}/ccsidcurl.h" |
|
|
sed -e 'H;s/.*//;x;s/\n//;s/.*/& /' \
|
|
-e '/^CURL_EXTERN[[:space:]]/!d' \
|
|
-e '/\;/!{x;d;}' \
|
|
-e 's/ CURL_DEPRECATED([^)]*)//g' \
|
|
-e 's/ CURL_TEMP_PRINTF([^)]*)//g' \
|
|
-e 's/[[:space:]]*(.*$//' \
|
|
-e 's/^.*[^A-Za-z0-9_]\([A-Za-z0-9_]*\)$/\1/')
|
|
|
|
|
|
# Create the service program exportation file in DB2 member if needed.
|
|
|
|
BSF="${LIBIFSNAME}/TOOLS.FILE/BNDSRC.MBR"
|
|
|
|
if action_needed "${BSF}" Makefile.am
|
|
then LINK=YES
|
|
fi
|
|
|
|
if [ -n "${LINK}" ]
|
|
then echo " STRPGMEXP PGMLVL(*CURRENT) SIGNATURE('LIBCURL_${SONAME}')" \
|
|
> "${BSF}"
|
|
for EXPORT in ${EXPORTS}
|
|
do echo ' EXPORT SYMBOL("'"${EXPORT}"'")' >> "${BSF}"
|
|
done
|
|
|
|
echo ' ENDPGMEXP' >> "${BSF}"
|
|
fi
|
|
|
|
|
|
# Build the service program if needed.
|
|
|
|
if action_needed "${LIBIFSNAME}/${SRVPGM}.SRVPGM"
|
|
then LINK=YES
|
|
fi
|
|
|
|
if [ -n "${LINK}" ]
|
|
then CMD="CRTSRVPGM SRVPGM(${TARGETLIB}/${SRVPGM})"
|
|
CMD="${CMD} SRCFILE(${TARGETLIB}/TOOLS) SRCMBR(BNDSRC)"
|
|
CMD="${CMD} MODULE(${TARGETLIB}/OS400)"
|
|
CMD="${CMD} BNDDIR(${TARGETLIB}/${STATBNDDIR}"
|
|
if [ "${WITH_ZLIB}" != 0 ]
|
|
then CMD="${CMD} ${ZLIB_LIB}/${ZLIB_BNDDIR}"
|
|
liblist -a "${ZLIB_LIB}"
|
|
fi
|
|
if [ "${WITH_LIBSSH2}" != 0 ]
|
|
then CMD="${CMD} ${LIBSSH2_LIB}/${LIBSSH2_BNDDIR}"
|
|
liblist -a "${LIBSSH2_LIB}"
|
|
fi
|
|
CMD="${CMD})"
|
|
CMD="${CMD} BNDSRVPGM(QADRTTS QGLDCLNT QGLDBRDR)"
|
|
CMD="${CMD} TEXT('curl API library')"
|
|
CMD="${CMD} TGTRLS(${TGTRLS})"
|
|
CLcommand "${CMD}"
|
|
LINK=YES
|
|
fi
|
|
|
|
|
|
# If needed, (re)create the dynamic binding directory.
|
|
|
|
if action_needed "${LIBIFSNAME}/${DYNBNDDIR}.BNDDIR"
|
|
then LINK=YES
|
|
fi
|
|
|
|
if [ -n "${LINK}" ]
|
|
then rm -rf "${LIBIFSNAME}/${DYNBNDDIR}.BNDDIR"
|
|
CMD="CRTBNDDIR BNDDIR(${TARGETLIB}/${DYNBNDDIR})"
|
|
CMD="${CMD} TEXT('libcurl API dynamic binding directory')"
|
|
CLcommand "${CMD}"
|
|
CMD="ADDBNDDIRE BNDDIR(${TARGETLIB}/${DYNBNDDIR})"
|
|
CMD="${CMD} OBJ((*LIBL/${SRVPGM} *SRVPGM))"
|
|
CLcommand "${CMD}"
|
|
fi
|