mirror of
https://github.com/open-goal/jak-project
synced 2026-08-21 14:54:53 -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)
265 lines
6.7 KiB
C
Vendored
Generated
265 lines
6.7 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
|
|
*
|
|
***************************************************************************/
|
|
/* <DESC>
|
|
* Multiplexed HTTP/2 downloads over a single connection
|
|
* </DESC>
|
|
*/
|
|
#ifdef _MSC_VER
|
|
#ifndef _CRT_SECURE_NO_WARNINGS
|
|
#define _CRT_SECURE_NO_WARNINGS /* for _snprintf(), fopen(), strerror() */
|
|
#endif
|
|
#endif
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
|
|
#include <curl/curl.h>
|
|
|
|
#ifndef CURLPIPE_MULTIPLEX
|
|
/* This little trick makes sure that we do not enable pipelining for libcurls
|
|
old enough to not have this symbol. It is _not_ defined to zero in a recent
|
|
libcurl header. */
|
|
#define CURLPIPE_MULTIPLEX 0L
|
|
#endif
|
|
|
|
#if defined(_MSC_VER) && (_MSC_VER < 1900)
|
|
#define snprintf _snprintf
|
|
#endif
|
|
|
|
struct transfer {
|
|
FILE *out;
|
|
CURL *curl;
|
|
int num;
|
|
};
|
|
|
|
static void dump(const char *text, int num, const unsigned char *ptr,
|
|
size_t size, char nohex)
|
|
{
|
|
size_t i;
|
|
size_t c;
|
|
unsigned int width = 0x10;
|
|
|
|
if(nohex)
|
|
/* without the hex output, we can fit more on screen */
|
|
width = 0x40;
|
|
|
|
fprintf(stderr, "%d %s, %lu bytes (0x%lx)\n",
|
|
num, text, (unsigned long)size, (unsigned long)size);
|
|
|
|
for(i = 0; i < size; i += width) {
|
|
|
|
fprintf(stderr, "%4.4lx: ", (unsigned long)i);
|
|
|
|
if(!nohex) {
|
|
/* hex not disabled, show it */
|
|
for(c = 0; c < width; c++)
|
|
if(i + c < size)
|
|
fprintf(stderr, "%02x ", ptr[i + c]);
|
|
else
|
|
fputs(" ", stderr);
|
|
}
|
|
|
|
for(c = 0; (c < width) && (i + c < size); c++) {
|
|
/* check for 0D0A; if found, skip past and start a new line of output */
|
|
if(nohex && (i + c + 1 < size) && ptr[i + c] == 0x0D &&
|
|
ptr[i + c + 1] == 0x0A) {
|
|
i += (c + 2 - width);
|
|
break;
|
|
}
|
|
fprintf(stderr, "%c",
|
|
(ptr[i + c] >= 0x20) && (ptr[i + c] < 0x80) ? ptr[i + c] : '.');
|
|
/* check again for 0D0A, to avoid an extra \n if it is at width */
|
|
if(nohex && (i + c + 2 < size) && ptr[i + c + 1] == 0x0D &&
|
|
ptr[i + c + 2] == 0x0A) {
|
|
i += (c + 3 - width);
|
|
break;
|
|
}
|
|
}
|
|
fputc('\n', stderr); /* newline */
|
|
}
|
|
}
|
|
|
|
static int my_trace(CURL *curl, curl_infotype type,
|
|
char *data, size_t size, void *userp)
|
|
{
|
|
const char *text;
|
|
struct transfer *t = (struct transfer *)userp;
|
|
int num = t->num;
|
|
(void)curl;
|
|
|
|
switch(type) {
|
|
case CURLINFO_TEXT:
|
|
fprintf(stderr, "== [%d] Info: %s", num, data);
|
|
return 0;
|
|
case CURLINFO_HEADER_OUT:
|
|
text = "=> Send header";
|
|
break;
|
|
case CURLINFO_DATA_OUT:
|
|
text = "=> Send data";
|
|
break;
|
|
case CURLINFO_SSL_DATA_OUT:
|
|
text = "=> Send SSL data";
|
|
break;
|
|
case CURLINFO_HEADER_IN:
|
|
text = "<= Recv header";
|
|
break;
|
|
case CURLINFO_DATA_IN:
|
|
text = "<= Recv data";
|
|
break;
|
|
case CURLINFO_SSL_DATA_IN:
|
|
text = "<= Recv SSL data";
|
|
break;
|
|
default: /* in case a new one is introduced to shock us */
|
|
return 0;
|
|
}
|
|
|
|
dump(text, num, (const unsigned char *)data, size, 1);
|
|
return 0;
|
|
}
|
|
|
|
static int setup(struct transfer *t, int num)
|
|
{
|
|
char filename[128];
|
|
CURL *curl;
|
|
|
|
curl = t->curl = NULL;
|
|
|
|
t->num = num;
|
|
snprintf(filename, sizeof(filename), "dl-%d", num);
|
|
t->out = fopen(filename, "wb");
|
|
if(!t->out) {
|
|
fprintf(stderr, "error: could not open file %s for writing: %s\n",
|
|
filename, strerror(errno));
|
|
return 1;
|
|
}
|
|
|
|
curl = t->curl = curl_easy_init();
|
|
if(curl) {
|
|
|
|
/* write to this file */
|
|
curl_easy_setopt(curl, CURLOPT_WRITEDATA, t->out);
|
|
|
|
/* set the same URL */
|
|
curl_easy_setopt(curl, CURLOPT_URL, "https://localhost:8443/index.html");
|
|
|
|
/* please be verbose */
|
|
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
|
|
curl_easy_setopt(curl, CURLOPT_DEBUGFUNCTION, my_trace);
|
|
curl_easy_setopt(curl, CURLOPT_DEBUGDATA, t);
|
|
|
|
/* enlarge the receive buffer for potentially higher transfer speeds */
|
|
curl_easy_setopt(curl, CURLOPT_BUFFERSIZE, 100000L);
|
|
|
|
/* HTTP/2 please */
|
|
curl_easy_setopt(curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_0);
|
|
|
|
#if CURLPIPE_MULTIPLEX > 0
|
|
/* wait for pipe connection to confirm */
|
|
curl_easy_setopt(curl, CURLOPT_PIPEWAIT, 1L);
|
|
#endif
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* Download many transfers over HTTP/2, using the same connection!
|
|
*/
|
|
int main(int argc, const char **argv)
|
|
{
|
|
CURLcode result;
|
|
struct transfer *trans;
|
|
CURLM *multi = NULL;
|
|
int i;
|
|
int still_running = 0; /* keep number of running handles */
|
|
int num_transfers;
|
|
|
|
if(argc > 1) {
|
|
/* if given a number, do that many transfers */
|
|
num_transfers = atoi(argv[1]);
|
|
if((num_transfers < 1) || (num_transfers > 1000))
|
|
num_transfers = 3; /* a suitable low default */
|
|
}
|
|
else
|
|
num_transfers = 3; /* a suitable low default */
|
|
|
|
result = curl_global_init(CURL_GLOBAL_ALL);
|
|
if(result != CURLE_OK)
|
|
return (int)result;
|
|
|
|
trans = calloc(num_transfers, sizeof(*trans));
|
|
if(!trans) {
|
|
fprintf(stderr, "error allocating transfer structs\n");
|
|
goto error;
|
|
}
|
|
|
|
/* init a multi stack */
|
|
multi = curl_multi_init();
|
|
if(!multi)
|
|
goto error;
|
|
|
|
for(i = 0; i < num_transfers; i++) {
|
|
if(setup(&trans[i], i)) {
|
|
goto error;
|
|
}
|
|
|
|
/* add the individual transfer */
|
|
curl_multi_add_handle(multi, trans[i].curl);
|
|
}
|
|
|
|
curl_multi_setopt(multi, CURLMOPT_PIPELINING, CURLPIPE_MULTIPLEX);
|
|
|
|
do {
|
|
CURLMcode mresult = curl_multi_perform(multi, &still_running);
|
|
|
|
if(still_running)
|
|
/* wait for activity, timeout or "nothing" */
|
|
mresult = curl_multi_poll(multi, NULL, 0, 1000, NULL);
|
|
|
|
if(mresult)
|
|
break;
|
|
|
|
} while(still_running);
|
|
|
|
error:
|
|
|
|
if(multi) {
|
|
for(i = 0; i < num_transfers; i++) {
|
|
curl_multi_remove_handle(multi, trans[i].curl);
|
|
curl_easy_cleanup(trans[i].curl);
|
|
|
|
if(trans[i].out)
|
|
fclose(trans[i].out);
|
|
}
|
|
curl_multi_cleanup(multi);
|
|
}
|
|
|
|
free(trans);
|
|
|
|
curl_global_cleanup();
|
|
|
|
return 0;
|
|
}
|