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)
298 lines
9.8 KiB
Bash
Vendored
Generated
298 lines
9.8 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
|
|
#
|
|
###########################################################################
|
|
|
|
CLcommand()
|
|
{
|
|
/usr/bin/system "${@}" || exit 1
|
|
}
|
|
|
|
setenv()
|
|
|
|
{
|
|
# Define and export.
|
|
|
|
eval "${1}=${2}"
|
|
export "${1?}"
|
|
}
|
|
|
|
|
|
case "${SCRIPTDIR}" in
|
|
/*) ;;
|
|
*) SCRIPTDIR="$(pwd)/${SCRIPTDIR}"
|
|
esac
|
|
|
|
while true
|
|
do case "${SCRIPTDIR}" in
|
|
*/.) SCRIPTDIR="${SCRIPTDIR%/.}";;
|
|
*) break;;
|
|
esac
|
|
done
|
|
|
|
# The script directory is supposed to be in $TOPDIR/projects/os400.
|
|
|
|
TOPDIR=$(dirname "${SCRIPTDIR}")
|
|
TOPDIR=$(dirname "${TOPDIR}")
|
|
export SCRIPTDIR TOPDIR
|
|
|
|
# Extract the SONAME from the library makefile.
|
|
|
|
SONAME="$(sed -e '/^VERSIONCHANGE=/!d;s/^.*=\([0-9]*\).*/\1/' \
|
|
< "${TOPDIR}/lib/Makefile.soname")"
|
|
export SONAME
|
|
|
|
# Get OS/400 configuration parameters.
|
|
|
|
. "${SCRIPTDIR}/config400.default"
|
|
if [ -f "${SCRIPTDIR}/config400.override" ]
|
|
then . "${SCRIPTDIR}/config400.override"
|
|
fi
|
|
|
|
# Check if perl available.
|
|
{ [ -n "${PASEPERL}" ] && [ -x "${PASEPERL}" ]; } || PASEPERL=
|
|
|
|
# Need to get the version definitions.
|
|
|
|
LIBCURL_VERSION=$(grep '^#define *LIBCURL_VERSION ' \
|
|
"${TOPDIR}/include/curl/curlver.h" |
|
|
sed 's/.*"\(.*\)".*/\1/')
|
|
LIBCURL_VERSION_MAJOR=$(grep '^#define *LIBCURL_VERSION_MAJOR ' \
|
|
"${TOPDIR}/include/curl/curlver.h" |
|
|
sed 's/^#define *LIBCURL_VERSION_MAJOR *\([^ ]*\).*/\1/')
|
|
LIBCURL_VERSION_MINOR=$(grep '^#define *LIBCURL_VERSION_MINOR ' \
|
|
"${TOPDIR}/include/curl/curlver.h" |
|
|
sed 's/^#define *LIBCURL_VERSION_MINOR *\([^ ]*\).*/\1/')
|
|
LIBCURL_VERSION_PATCH=$(grep '^#define *LIBCURL_VERSION_PATCH ' \
|
|
"${TOPDIR}/include/curl/curlver.h" |
|
|
sed 's/^#define *LIBCURL_VERSION_PATCH *\([^ ]*\).*/\1/')
|
|
LIBCURL_VERSION_NUM=$(grep '^#define *LIBCURL_VERSION_NUM ' \
|
|
"${TOPDIR}/include/curl/curlver.h" |
|
|
sed 's/^#define *LIBCURL_VERSION_NUM *0x\([^ ]*\).*/\1/')
|
|
LIBCURL_TIMESTAMP=$(grep '^#define *LIBCURL_TIMESTAMP ' \
|
|
"${TOPDIR}/include/curl/curlver.h" |
|
|
sed 's/.*"\(.*\)".*/\1/')
|
|
export LIBCURL_VERSION
|
|
export LIBCURL_VERSION_MAJOR LIBCURL_VERSION_MINOR LIBCURL_VERSION_PATCH
|
|
export LIBCURL_VERSION_NUM LIBCURL_TIMESTAMP
|
|
|
|
################################################################################
|
|
#
|
|
# OS/400 specific definitions.
|
|
#
|
|
################################################################################
|
|
|
|
LIBIFSNAME="/QSYS.LIB/${TARGETLIB}.LIB"
|
|
|
|
|
|
################################################################################
|
|
#
|
|
# Procedures.
|
|
#
|
|
################################################################################
|
|
|
|
# action_needed dest [src]
|
|
#
|
|
# dest is an object to build
|
|
# if specified, src is an object on which dest depends.
|
|
#
|
|
# exit 0 (succeeds) if some action has to be taken, else 1.
|
|
|
|
action_needed()
|
|
|
|
{
|
|
[ ! -e "${1}" ] && return 0
|
|
[ -n "${2}" ] || return 1
|
|
# shellcheck disable=SC3013
|
|
[ "${1}" -ot "${2}" ] && return 0
|
|
return 1
|
|
}
|
|
|
|
|
|
# canonicalize_path path
|
|
#
|
|
# Return canonicalized path as:
|
|
# - Absolute
|
|
# - No . or .. component.
|
|
|
|
canonicalize_path()
|
|
|
|
{
|
|
if expr "${1}" : '^/' > /dev/null
|
|
then P="${1}"
|
|
else P="$(pwd)/${1}"
|
|
fi
|
|
|
|
R=
|
|
IFSSAVE="${IFS}"
|
|
IFS="/"
|
|
|
|
for C in ${P}
|
|
do IFS="${IFSSAVE}"
|
|
case "${C}" in
|
|
.) ;;
|
|
..) R="$(expr "${R}" : '^\(.*/\)..*')"
|
|
;;
|
|
?*) R="${R}${C}/"
|
|
;;
|
|
*) ;;
|
|
esac
|
|
done
|
|
|
|
IFS="${IFSSAVE}"
|
|
echo "/$(expr "${R}" : '^\(.*\)/')"
|
|
}
|
|
|
|
|
|
# make_module module_name source_name [additional_definitions]
|
|
#
|
|
# Compile source name into ASCII module if needed.
|
|
# As side effect, append the module name to variable MODULES.
|
|
# Set LINK to "YES" if the module has been compiled.
|
|
|
|
make_module()
|
|
|
|
{
|
|
MODULES="${MODULES} ${1}"
|
|
MODIFSNAME="${LIBIFSNAME}/${1}.MODULE"
|
|
action_needed "${MODIFSNAME}" "${2}" || return 0;
|
|
SRCDIR="$(dirname "$(canonicalize_path "${2}")")"
|
|
|
|
# #pragma convert has to be in the source file itself, i.e.
|
|
# putting it in an include file makes it only active
|
|
# for that include file.
|
|
# Thus we build a temporary file with the pragma prepended to
|
|
# the source file and we compile that temporary file.
|
|
|
|
{
|
|
echo "#line 1 \"${2}\""
|
|
echo "#pragma convert(819)"
|
|
echo "#line 1"
|
|
cat "${2}"
|
|
} > "${1}"__819.c
|
|
CMD="CRTCMOD MODULE(${TARGETLIB}/${1}) SRCSTMF('${1}__819.c')"
|
|
CMD="${CMD} SYSIFCOPT(*IFS64IO *ASYNCSIGNAL)"
|
|
# CMD="${CMD} OPTION(*INCDIRFIRST *SHOWINC *SHOWSYS)"
|
|
CMD="${CMD} OPTION(*INCDIRFIRST)"
|
|
CMD="${CMD} LOCALETYPE(*LOCALE) FLAG(10)"
|
|
CMD="${CMD} INCDIR('${QADRTDIR}/include'"
|
|
CMD="${CMD} '${TOPDIR}/include/curl' '${TOPDIR}/include' '${SRCDIR}'"
|
|
CMD="${CMD} '${TOPDIR}/projects/OS400'"
|
|
|
|
if [ "${WITH_ZLIB}" != "0" ]
|
|
then CMD="${CMD} '${ZLIB_INCLUDE}'"
|
|
fi
|
|
|
|
if [ "${WITH_LIBSSH2}" != "0" ]
|
|
then CMD="${CMD} '${LIBSSH2_INCLUDE}'"
|
|
fi
|
|
|
|
CMD="${CMD} ${INCLUDES})"
|
|
CMD="${CMD} TGTCCSID(${TGTCCSID}) TGTRLS(${TGTRLS})"
|
|
CMD="${CMD} OUTPUT(${OUTPUT})"
|
|
CMD="${CMD} OPTIMIZE(${OPTIMIZE})"
|
|
CMD="${CMD} DBGVIEW(${DEBUG})"
|
|
|
|
DEFINES="${3} 'qadrt_use_inline'"
|
|
|
|
if [ "${WITH_ZLIB}" != "0" ]
|
|
then DEFINES="${DEFINES} HAVE_LIBZ"
|
|
fi
|
|
|
|
if [ "${WITH_LIBSSH2}" != "0" ]
|
|
then DEFINES="${DEFINES} USE_LIBSSH2"
|
|
fi
|
|
|
|
if [ -n "${DEFINES}" ]
|
|
then CMD="${CMD} DEFINE(${DEFINES})"
|
|
fi
|
|
|
|
CLcommand "${CMD}"
|
|
if [ "${DEBUG}" = "*NONE" ]
|
|
then rm -f "${1}"__819.c
|
|
fi
|
|
# shellcheck disable=SC2034
|
|
LINK=YES
|
|
}
|
|
|
|
|
|
# Determine DB2 object name from IFS name.
|
|
|
|
db2_name()
|
|
|
|
{
|
|
if [ "${2}" = 'nomangle' ]
|
|
then basename "${1}" |
|
|
tr 'a-z-' 'A-Z_' |
|
|
sed -e 's/\..*//' \
|
|
-e 's/^\(.\).*\(.........\)$/\1\2/'
|
|
else basename "${1}" |
|
|
tr 'a-z-' 'A-Z_' |
|
|
sed -e 's/\..*//' \
|
|
-e 's/^CURL_*/C/' \
|
|
-e 's/^TOOL_*/T/' \
|
|
-e 's/^\(.\).*\(.........\)$/\1\2/'
|
|
fi
|
|
}
|
|
|
|
|
|
# Copy IFS file replacing version info.
|
|
|
|
versioned_copy()
|
|
|
|
{
|
|
sed -e "s/@LIBCURL_VERSION@/${LIBCURL_VERSION}/g" \
|
|
-e "s/@LIBCURL_VERSION_MAJOR@/${LIBCURL_VERSION_MAJOR}/g" \
|
|
-e "s/@LIBCURL_VERSION_MINOR@/${LIBCURL_VERSION_MINOR}/g" \
|
|
-e "s/@LIBCURL_VERSION_PATCH@/${LIBCURL_VERSION_PATCH}/g" \
|
|
-e "s/@LIBCURL_VERSION_NUM@/${LIBCURL_VERSION_NUM}/g" \
|
|
-e "s/@LIBCURL_TIMESTAMP@/${LIBCURL_TIMESTAMP}/g" \
|
|
< "${1}" > "${2}"
|
|
}
|
|
|
|
|
|
# Get definitions from a make file.
|
|
# The `sed' statement works as follows:
|
|
# - Join \nl-separated lines.
|
|
# - Retain only lines that begins with "identifier =".
|
|
# - Replace @...@ substitutions by shell variable references.
|
|
# - Turn these lines into shell variable assignments.
|
|
|
|
get_make_vars()
|
|
|
|
{
|
|
eval "$(sed -e ': begin' \
|
|
-e '/\\$/{' \
|
|
-e 'N' \
|
|
-e 's/\\\n/ /' \
|
|
-e 'b begin' \
|
|
-e '}' \
|
|
-e 's/[[:space:]][[:space:]]*/ /g' \
|
|
-e '/^[A-Za-z_][A-Za-z0-9_]* *=/!d' \
|
|
-e 's/@\([A-Za-z0-9_]*\)@/${\1}/g' \
|
|
-e 's/ *= */=/' \
|
|
-e 's/=\(.*[^ ]\) *$/="\1"/' \
|
|
-e 's/\$(\([^)]*\))/${\1}/g' \
|
|
< "${1}")"
|
|
}
|