mirror of
https://github.com/open-goal/jak-project
synced 2026-09-05 02:55:51 -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)
99 lines
2.8 KiB
C
Vendored
Generated
99 lines
2.8 KiB
C
Vendored
Generated
/* File: report_openssl_version.c
|
|
*
|
|
* This file dynamically loads the OpenSSL shared image to report the
|
|
* version string.
|
|
*
|
|
* It will optionally place that version string in a DCL symbol.
|
|
*
|
|
* Usage: report_openssl_version <shared_image> [<dcl_symbol>]
|
|
*
|
|
* 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
|
|
*
|
|
*/
|
|
|
|
#include <dlfcn.h>
|
|
#include <openssl/opensslv.h>
|
|
#include <openssl/crypto.h>
|
|
|
|
#include <string.h>
|
|
#include <descrip.h>
|
|
#include <libclidef.h>
|
|
#include <stsdef.h>
|
|
#include <errno.h>
|
|
|
|
unsigned long LIB$SET_SYMBOL(const struct dsc$descriptor_s *symbol,
|
|
const struct dsc$descriptor_s *value,
|
|
const unsigned long *table_type);
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
void *libptr;
|
|
const char *(*ssl_version)(int t);
|
|
const char *version;
|
|
|
|
if(argc < 1) {
|
|
puts("report_openssl_version filename");
|
|
return 1;
|
|
}
|
|
|
|
libptr = dlopen(argv[1], 0);
|
|
|
|
ssl_version = (const char *(*)(int))dlsym(libptr, "SSLeay_version");
|
|
if(!ssl_version) {
|
|
ssl_version = (const char *(*)(int))dlsym(libptr, "ssleay_version");
|
|
if(!ssl_version) {
|
|
ssl_version = (const char *(*)(int))dlsym(libptr, "SSLEAY_VERSION");
|
|
}
|
|
}
|
|
|
|
dlclose(libptr);
|
|
|
|
if(!ssl_version) {
|
|
puts("Unable to lookup version of OpenSSL");
|
|
return 1;
|
|
}
|
|
|
|
version = ssl_version(SSLEAY_VERSION);
|
|
|
|
puts(version);
|
|
|
|
/* Was a symbol argument given? */
|
|
if(argc > 1) {
|
|
int status;
|
|
struct dsc$descriptor_s symbol_dsc;
|
|
struct dsc$descriptor_s value_dsc;
|
|
const unsigned long table_type = LIB$K_CLI_LOCAL_SYM;
|
|
|
|
symbol_dsc.dsc$a_pointer = argv[2];
|
|
symbol_dsc.dsc$w_length = strlen(argv[2]);
|
|
symbol_dsc.dsc$b_dtype = DSC$K_DTYPE_T;
|
|
symbol_dsc.dsc$b_class = DSC$K_CLASS_S;
|
|
|
|
value_dsc.dsc$a_pointer = (char *)version; /* Cast ok */
|
|
value_dsc.dsc$w_length = strlen(version);
|
|
value_dsc.dsc$b_dtype = DSC$K_DTYPE_T;
|
|
value_dsc.dsc$b_class = DSC$K_CLASS_S;
|
|
|
|
status = LIB$SET_SYMBOL(&symbol_dsc, &value_dsc, &table_type);
|
|
if(!$VMS_STATUS_SUCCESS(status)) {
|
|
return status;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|