mirror of
https://github.com/open-goal/jak-project
synced 2026-08-06 18:03:30 -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)
187 lines
5.1 KiB
C
Vendored
Generated
187 lines
5.1 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>
|
|
* HTTP/2 server push. Receive all data in memory.
|
|
* </DESC>
|
|
*/
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include <curl/curl.h>
|
|
|
|
struct Memory {
|
|
char *memory;
|
|
size_t size;
|
|
};
|
|
|
|
static size_t write_cb(char *contents, size_t size, size_t nmemb, void *userp)
|
|
{
|
|
size_t realsize = size * nmemb;
|
|
struct Memory *mem = (struct Memory *)userp;
|
|
char *ptr = realloc(mem->memory, mem->size + realsize + 1);
|
|
if(!ptr) {
|
|
/* out of memory! */
|
|
printf("not enough memory (realloc returned NULL)\n");
|
|
return 0;
|
|
}
|
|
|
|
mem->memory = ptr;
|
|
memcpy(&(mem->memory[mem->size]), contents, realsize);
|
|
mem->size += realsize;
|
|
mem->memory[mem->size] = 0;
|
|
|
|
return realsize;
|
|
}
|
|
|
|
#define MAX_FILES 10
|
|
static struct Memory files[MAX_FILES];
|
|
static int pushindex = 1;
|
|
|
|
static void init_memory(struct Memory *chunk)
|
|
{
|
|
chunk->memory = malloc(1); /* grown as needed with realloc */
|
|
chunk->size = 0; /* no data at this point */
|
|
}
|
|
|
|
static void setup(CURL *curl)
|
|
{
|
|
/* set the same URL */
|
|
curl_easy_setopt(curl, CURLOPT_URL, "https://localhost:8443/index.html");
|
|
|
|
/* HTTP/2 please */
|
|
curl_easy_setopt(curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_0);
|
|
|
|
/* we use a self-signed test server, skip verification during debugging */
|
|
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
|
|
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);
|
|
|
|
/* write data to a struct */
|
|
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_cb);
|
|
init_memory(&files[0]);
|
|
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &files[0]);
|
|
|
|
/* wait for pipe connection to confirm */
|
|
curl_easy_setopt(curl, CURLOPT_PIPEWAIT, 1L);
|
|
}
|
|
|
|
/* called when there is an incoming push */
|
|
static int server_push_callback(CURL *parent,
|
|
CURL *curl,
|
|
size_t num_headers,
|
|
struct curl_pushheaders *headers,
|
|
void *userp)
|
|
{
|
|
const char *headp;
|
|
int *transfers = (int *)userp;
|
|
(void)parent;
|
|
(void)num_headers;
|
|
|
|
if(pushindex == MAX_FILES)
|
|
/* cannot fit anymore */
|
|
return CURL_PUSH_DENY;
|
|
|
|
/* write to this buffer */
|
|
init_memory(&files[pushindex]);
|
|
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &files[pushindex]);
|
|
pushindex++;
|
|
|
|
headp = curl_pushheader_byname(headers, ":path");
|
|
if(headp)
|
|
fprintf(stderr, "* Pushed :path '%s'\n", headp /* skip :path + colon */);
|
|
|
|
(*transfers)++; /* one more */
|
|
return CURL_PUSH_OK;
|
|
}
|
|
|
|
/*
|
|
* Download a file over HTTP/2, take care of server push.
|
|
*/
|
|
int main(void)
|
|
{
|
|
CURL *curl;
|
|
CURLM *multi;
|
|
int transfers = 1; /* we start with one */
|
|
int i;
|
|
|
|
CURLcode result = curl_global_init(CURL_GLOBAL_ALL);
|
|
if(result != CURLE_OK)
|
|
return (int)result;
|
|
|
|
/* init a multi stack */
|
|
multi = curl_multi_init();
|
|
|
|
curl = curl_easy_init();
|
|
|
|
/* set options */
|
|
setup(curl);
|
|
|
|
/* add the easy transfer */
|
|
curl_multi_add_handle(multi, curl);
|
|
|
|
curl_multi_setopt(multi, CURLMOPT_PIPELINING, CURLPIPE_MULTIPLEX);
|
|
curl_multi_setopt(multi, CURLMOPT_PUSHFUNCTION, server_push_callback);
|
|
curl_multi_setopt(multi, CURLMOPT_PUSHDATA, &transfers);
|
|
|
|
while(transfers) {
|
|
struct CURLMsg *m;
|
|
int still_running; /* keep number of running handles */
|
|
int rc;
|
|
|
|
CURLMcode mresult = curl_multi_perform(multi, &still_running);
|
|
if(mresult)
|
|
break;
|
|
|
|
mresult = curl_multi_wait(multi, NULL, 0, 1000, &rc);
|
|
if(mresult)
|
|
break;
|
|
|
|
/*
|
|
* When doing server push, libcurl itself created and added one or more
|
|
* easy handles but *we* need to clean them up when they are done.
|
|
*/
|
|
do {
|
|
int msgq = 0;
|
|
m = curl_multi_info_read(multi, &msgq);
|
|
if(m && (m->msg == CURLMSG_DONE)) {
|
|
curl = m->easy_handle;
|
|
transfers--;
|
|
curl_multi_remove_handle(multi, curl);
|
|
curl_easy_cleanup(curl);
|
|
}
|
|
} while(m);
|
|
}
|
|
|
|
curl_multi_cleanup(multi);
|
|
curl_global_cleanup();
|
|
|
|
/* 'pushindex' is now the number of received transfers */
|
|
for(i = 0; i < pushindex; i++) {
|
|
/* do something fun with the data, and then free it when done */
|
|
free(files[i].memory);
|
|
}
|
|
|
|
return 0;
|
|
}
|