mirror of
https://github.com/open-goal/jak-project
synced 2026-08-20 14:24: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)
205 lines
5.6 KiB
C
Vendored
Generated
205 lines
5.6 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 "first.h"
|
|
|
|
#ifdef HAVE_NETINET_IN_H
|
|
#include <netinet/in.h>
|
|
#endif
|
|
#ifdef HAVE_NETDB_H
|
|
#include <netdb.h>
|
|
#endif
|
|
#ifdef HAVE_ARPA_INET_H
|
|
#include <arpa/inet.h>
|
|
#endif
|
|
|
|
#define RTP_PKT_CHANNEL(p) ((int)((unsigned char)((p)[1])))
|
|
|
|
#define RTP_PKT_LENGTH(p) ((((int)((unsigned char)((p)[2]))) << 8) | \
|
|
((int)((unsigned char)((p)[3]))))
|
|
|
|
#define RTP_DATA_SIZE 12
|
|
|
|
static int rtp_packet_count = 0;
|
|
|
|
static size_t rtp_write(char *data, size_t size, size_t nmemb, void *stream)
|
|
{
|
|
static const char *RTP_DATA = "$_1234\n\0Rsdf";
|
|
|
|
int channel = RTP_PKT_CHANNEL(data);
|
|
int message_size;
|
|
int coded_size = RTP_PKT_LENGTH(data);
|
|
size_t failure = (size && nmemb) ? 0 : 1;
|
|
int i;
|
|
(void)stream;
|
|
|
|
message_size = curlx_uztosi(size * nmemb) - 4;
|
|
|
|
curl_mprintf("RTP: message size %d, channel %d\n", message_size, channel);
|
|
if(message_size != coded_size) {
|
|
curl_mprintf("RTP embedded size (%d) does not match "
|
|
"the write size (%d).\n", coded_size, message_size);
|
|
return failure;
|
|
}
|
|
|
|
data += 4;
|
|
for(i = 0; i < message_size; i += RTP_DATA_SIZE) {
|
|
if(message_size - i > RTP_DATA_SIZE) {
|
|
if(memcmp(RTP_DATA, data + i, RTP_DATA_SIZE)) {
|
|
curl_mprintf("RTP PAYLOAD CORRUPTED [%s]\n", data + i);
|
|
#if 0
|
|
return failure;
|
|
#endif
|
|
}
|
|
}
|
|
else {
|
|
if(memcmp(RTP_DATA, data + i, message_size - i)) {
|
|
curl_mprintf("RTP PAYLOAD END CORRUPTED (%d), [%s]\n",
|
|
message_size - i, data + i);
|
|
#if 0
|
|
return failure;
|
|
#endif
|
|
}
|
|
}
|
|
}
|
|
|
|
rtp_packet_count++;
|
|
curl_mfprintf(stderr, "packet count is %d\n", rtp_packet_count);
|
|
|
|
return size * nmemb;
|
|
}
|
|
|
|
static CURLcode test_lib571(const char *URL)
|
|
{
|
|
CURLcode result;
|
|
CURL *curl;
|
|
char *stream_uri = NULL;
|
|
int request = 1;
|
|
|
|
FILE *protofile = curlx_fopen(libtest_arg2, "wb");
|
|
if(!protofile) {
|
|
curl_mfprintf(stderr, "Could not open the protocol dump file\n");
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
|
|
if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
|
|
curl_mfprintf(stderr, "curl_global_init() failed\n");
|
|
curlx_fclose(protofile);
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
|
|
curl = curl_easy_init();
|
|
if(!curl) {
|
|
curl_mfprintf(stderr, "curl_easy_init() failed\n");
|
|
curlx_fclose(protofile);
|
|
curl_global_cleanup();
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
easy_setopt(curl, CURLOPT_URL, URL);
|
|
|
|
stream_uri = tutil_suburl(URL, request++);
|
|
if(!stream_uri) {
|
|
result = TEST_ERR_MAJOR_BAD;
|
|
goto test_cleanup;
|
|
}
|
|
easy_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri);
|
|
curl_free(stream_uri);
|
|
stream_uri = NULL;
|
|
|
|
easy_setopt(curl, CURLOPT_INTERLEAVEFUNCTION, rtp_write);
|
|
easy_setopt(curl, CURLOPT_TIMEOUT, 30L);
|
|
easy_setopt(curl, CURLOPT_VERBOSE, 1L);
|
|
easy_setopt(curl, CURLOPT_WRITEDATA, protofile);
|
|
|
|
easy_setopt(curl, CURLOPT_RTSP_TRANSPORT, "RTP/AVP/TCP;interleaved=0-1");
|
|
easy_setopt(curl, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_SETUP);
|
|
|
|
result = curl_easy_perform(curl);
|
|
if(result)
|
|
goto test_cleanup;
|
|
|
|
/* This PLAY starts the interleave */
|
|
stream_uri = tutil_suburl(URL, request++);
|
|
if(!stream_uri) {
|
|
result = TEST_ERR_MAJOR_BAD;
|
|
goto test_cleanup;
|
|
}
|
|
easy_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri);
|
|
curl_free(stream_uri);
|
|
stream_uri = NULL;
|
|
easy_setopt(curl, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_PLAY);
|
|
|
|
result = curl_easy_perform(curl);
|
|
if(result)
|
|
goto test_cleanup;
|
|
|
|
/* The DESCRIBE request tries to consume data after the Content */
|
|
stream_uri = tutil_suburl(URL, request++);
|
|
if(!stream_uri) {
|
|
result = TEST_ERR_MAJOR_BAD;
|
|
goto test_cleanup;
|
|
}
|
|
easy_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri);
|
|
curl_free(stream_uri);
|
|
stream_uri = NULL;
|
|
easy_setopt(curl, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_DESCRIBE);
|
|
|
|
result = curl_easy_perform(curl);
|
|
if(result)
|
|
goto test_cleanup;
|
|
|
|
stream_uri = tutil_suburl(URL, request++);
|
|
if(!stream_uri) {
|
|
result = TEST_ERR_MAJOR_BAD;
|
|
goto test_cleanup;
|
|
}
|
|
easy_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri);
|
|
curl_free(stream_uri);
|
|
stream_uri = NULL;
|
|
easy_setopt(curl, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_PLAY);
|
|
|
|
result = curl_easy_perform(curl);
|
|
if(result)
|
|
goto test_cleanup;
|
|
|
|
curl_mfprintf(stderr, "PLAY COMPLETE\n");
|
|
|
|
/* Use Receive to get the rest of the data */
|
|
while(!result && rtp_packet_count < 19) {
|
|
curl_mfprintf(stderr, "LOOPY LOOP!\n");
|
|
easy_setopt(curl, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_RECEIVE);
|
|
result = curl_easy_perform(curl);
|
|
}
|
|
|
|
test_cleanup:
|
|
curl_free(stream_uri);
|
|
|
|
if(protofile)
|
|
curlx_fclose(protofile);
|
|
|
|
curl_easy_cleanup(curl);
|
|
curl_global_cleanup();
|
|
|
|
return result;
|
|
}
|