mirror of
https://github.com/open-goal/jak-project
synced 2026-08-24 15:37:01 -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)
342 lines
7.3 KiB
C
Vendored
Generated
342 lines
7.3 KiB
C
Vendored
Generated
/***************************************************************************
|
|
* _ _ ____ _
|
|
* 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
|
|
*
|
|
***************************************************************************/
|
|
#include "curl_setup.h"
|
|
|
|
#include "curlx/warnless.h"
|
|
|
|
#if defined(__INTEL_COMPILER) && defined(__unix__)
|
|
|
|
#ifdef HAVE_NETINET_IN_H
|
|
#include <netinet/in.h>
|
|
#endif
|
|
#ifdef HAVE_ARPA_INET_H
|
|
#include <arpa/inet.h>
|
|
#endif
|
|
|
|
#endif /* __INTEL_COMPILER && __unix__ */
|
|
|
|
#define CURL_MASK_UCHAR ((unsigned char)~0)
|
|
|
|
#define CURL_MASK_USHORT ((unsigned short)~0)
|
|
|
|
#define CURL_MASK_UINT ((unsigned int)~0)
|
|
#define CURL_MASK_SINT (CURL_MASK_UINT >> 1)
|
|
|
|
#define CURL_MASK_ULONG ((unsigned long)~0)
|
|
|
|
#define CURL_MASK_USIZE_T ((size_t)~0)
|
|
#define CURL_MASK_SSIZE_T (CURL_MASK_USIZE_T >> 1)
|
|
|
|
/*
|
|
* unsigned long to unsigned char
|
|
*/
|
|
unsigned char curlx_ultouc(unsigned long ulnum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(push)
|
|
#pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
DEBUGASSERT(ulnum <= (unsigned long)CURL_MASK_UCHAR);
|
|
return (unsigned char)(ulnum & (unsigned long)CURL_MASK_UCHAR);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* unsigned size_t to signed int
|
|
*/
|
|
int curlx_uztosi(size_t uznum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(push)
|
|
#pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
DEBUGASSERT(uznum <= (size_t)CURL_MASK_SINT);
|
|
return (int)(uznum & (size_t)CURL_MASK_SINT);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* unsigned size_t to unsigned long
|
|
*/
|
|
unsigned long curlx_uztoul(size_t uznum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(push)
|
|
#pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
#if ULONG_MAX < SIZE_MAX
|
|
DEBUGASSERT(uznum <= (size_t)CURL_MASK_ULONG);
|
|
#endif
|
|
return (unsigned long)(uznum & (size_t)CURL_MASK_ULONG);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* unsigned size_t to unsigned int
|
|
*/
|
|
unsigned int curlx_uztoui(size_t uznum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(push)
|
|
#pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
#if UINT_MAX < SIZE_MAX
|
|
DEBUGASSERT(uznum <= (size_t)CURL_MASK_UINT);
|
|
#endif
|
|
return (unsigned int)(uznum & (size_t)CURL_MASK_UINT);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* signed long to signed int
|
|
*/
|
|
int curlx_sltosi(long slnum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(push)
|
|
#pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
DEBUGASSERT(slnum >= 0);
|
|
#if INT_MAX < LONG_MAX
|
|
DEBUGASSERT((unsigned long)slnum <= (unsigned long)CURL_MASK_SINT);
|
|
#endif
|
|
return (int)(slnum & (long)CURL_MASK_SINT);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* signed long to unsigned int
|
|
*/
|
|
unsigned int curlx_sltoui(long slnum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(push)
|
|
#pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
DEBUGASSERT(slnum >= 0);
|
|
#if UINT_MAX < LONG_MAX
|
|
DEBUGASSERT((unsigned long)slnum <= (unsigned long)CURL_MASK_UINT);
|
|
#endif
|
|
return (unsigned int)(slnum & (long)CURL_MASK_UINT);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* signed long to unsigned short
|
|
*/
|
|
unsigned short curlx_sltous(long slnum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(push)
|
|
#pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
DEBUGASSERT(slnum >= 0);
|
|
DEBUGASSERT((unsigned long)slnum <= (unsigned long)CURL_MASK_USHORT);
|
|
return (unsigned short)(slnum & (long)CURL_MASK_USHORT);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* unsigned size_t to signed ssize_t
|
|
*/
|
|
ssize_t curlx_uztosz(size_t uznum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(push)
|
|
#pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
DEBUGASSERT(uznum <= (size_t)CURL_MASK_SSIZE_T);
|
|
return (ssize_t)(uznum & (size_t)CURL_MASK_SSIZE_T);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* signed curl_off_t to unsigned size_t
|
|
*/
|
|
size_t curlx_sotouz(curl_off_t sonum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(push)
|
|
#pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
DEBUGASSERT(sonum >= 0);
|
|
return (size_t)(sonum & (curl_off_t)CURL_MASK_USIZE_T);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* signed ssize_t to signed int
|
|
*/
|
|
int curlx_sztosi(ssize_t sznum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(push)
|
|
#pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
DEBUGASSERT(sznum >= 0);
|
|
#if INT_MAX < SSIZE_MAX
|
|
DEBUGASSERT((size_t)sznum <= (size_t)CURL_MASK_SINT);
|
|
#endif
|
|
return (int)(sznum & (ssize_t)CURL_MASK_SINT);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* unsigned int to unsigned short
|
|
*/
|
|
unsigned short curlx_uitous(unsigned int uinum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(push)
|
|
#pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
DEBUGASSERT(uinum <= (unsigned int)CURL_MASK_USHORT);
|
|
return (unsigned short)(uinum & (unsigned int)CURL_MASK_USHORT);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* signed int to unsigned size_t
|
|
*/
|
|
size_t curlx_sitouz(int sinum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(push)
|
|
#pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
DEBUGASSERT(sinum >= 0);
|
|
return (size_t)sinum;
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
size_t curlx_uitouz(unsigned int uinum)
|
|
{
|
|
return (size_t)uinum;
|
|
}
|
|
|
|
size_t curlx_sotouz_range(curl_off_t sonum, size_t uzmin, size_t uzmax)
|
|
{
|
|
if(sonum < 0)
|
|
return uzmin;
|
|
#if SIZEOF_CURL_OFF_T > SIZEOF_SIZE_T
|
|
if(sonum > SIZE_MAX)
|
|
return uzmax;
|
|
#endif
|
|
return CURLMIN(CURLMAX((size_t)sonum, uzmin), uzmax);
|
|
}
|
|
|
|
bool curlx_sztouz(ssize_t sznum, size_t *puznum)
|
|
{
|
|
if(sznum < 0) {
|
|
*puznum = 0;
|
|
return FALSE;
|
|
}
|
|
*puznum = (size_t)sznum;
|
|
return TRUE;
|
|
}
|
|
|
|
bool curlx_sotouz_fits(curl_off_t sonum, size_t *puznum)
|
|
{
|
|
if(sonum < 0) {
|
|
*puznum = 0;
|
|
return FALSE;
|
|
}
|
|
#if SIZEOF_CURL_OFF_T > SIZEOF_SIZE_T
|
|
if(sonum > SIZE_MAX) {
|
|
*puznum = 0;
|
|
return FALSE;
|
|
}
|
|
#endif
|
|
*puznum = (size_t)sonum;
|
|
return TRUE;
|
|
}
|
|
|
|
bool curlx_sltouz(long slnum, size_t *puznum)
|
|
{
|
|
if(slnum < 0) {
|
|
*puznum = 0;
|
|
return FALSE;
|
|
}
|
|
/* We error in curl_setup.h if SIZEOF_LONG > SIZEOF_SIZE_T */
|
|
*puznum = (size_t)slnum;
|
|
return TRUE;
|
|
}
|
|
|
|
curl_off_t curlx_uztoso(size_t uznum)
|
|
{
|
|
#if SIZEOF_SIZE_T >= SIZEOF_CURL_OFF_T
|
|
if(uznum > (size_t)CURL_OFF_T_MAX)
|
|
return CURL_OFF_T_MAX;
|
|
#endif
|
|
return (curl_off_t)uznum;
|
|
}
|