mirror of
https://github.com/open-goal/jak-project
synced 2026-08-21 06:38:33 -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)
233 lines
6.8 KiB
C
Vendored
Generated
233 lines
6.8 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 "unitcheck.h"
|
|
#include "urldata.h"
|
|
#include "curl_addrinfo.h"
|
|
|
|
static CURLcode t1607_setup(void)
|
|
{
|
|
CURLcode result = CURLE_OK;
|
|
global_init(CURL_GLOBAL_ALL);
|
|
return result;
|
|
}
|
|
|
|
static CURLcode test_unit1607(const char *arg)
|
|
{
|
|
/* In builds without IPv6 support CURLOPT_RESOLVE should skip over those
|
|
addresses, so we have to do that as well. */
|
|
static const char skip = 0;
|
|
#ifdef USE_IPV6
|
|
#define IPV6ONLY(x) x
|
|
#else
|
|
#define IPV6ONLY(x) &skip
|
|
#endif
|
|
|
|
UNITTEST_BEGIN(t1607_setup())
|
|
|
|
struct testcase {
|
|
/* host:port:address[,address]... */
|
|
const char *optval;
|
|
|
|
/* lowercase host and port to retrieve the addresses from hostcache */
|
|
const char *host;
|
|
int port;
|
|
|
|
/* whether we expect a permanent or non-permanent cache entry */
|
|
bool permanent;
|
|
|
|
/* 0 to 9 addresses expected from hostcache */
|
|
const char *address[10];
|
|
};
|
|
|
|
/* CURLOPT_RESOLVE address parsing tests */
|
|
static const struct testcase tests[] = {
|
|
/* spaces are not allowed, for now */
|
|
{ "test.com:80:127.0.0.1, 127.0.0.2",
|
|
"test.com", 80, TRUE, { NULL, }
|
|
},
|
|
{ "TEST.com:80:,,127.0.0.1,,,127.0.0.2,,,,::1,,,",
|
|
"test.com", 80, TRUE, { "127.0.0.1", "127.0.0.2", IPV6ONLY("::1"), }
|
|
},
|
|
{ "test.com:80:::1,127.0.0.1",
|
|
"test.com", 80, TRUE, { IPV6ONLY("::1"), "127.0.0.1", }
|
|
},
|
|
{ "test.com:80:[::1],127.0.0.1",
|
|
"test.com", 80, TRUE, { IPV6ONLY("::1"), "127.0.0.1", }
|
|
},
|
|
{ "test.com:80:::1",
|
|
"test.com", 80, TRUE, { IPV6ONLY("::1"), }
|
|
},
|
|
{ "test.com:80:[::1]",
|
|
"test.com", 80, TRUE, { IPV6ONLY("::1"), }
|
|
},
|
|
{ "test.com:80:127.0.0.1",
|
|
"test.com", 80, TRUE, { "127.0.0.1", }
|
|
},
|
|
{ "test.com:80:,127.0.0.1",
|
|
"test.com", 80, TRUE, { "127.0.0.1", }
|
|
},
|
|
{ "test.com:80:127.0.0.1,",
|
|
"test.com", 80, TRUE, { "127.0.0.1", }
|
|
},
|
|
{ "test.com:0:127.0.0.1",
|
|
"test.com", 0, TRUE, { "127.0.0.1", }
|
|
},
|
|
{ "+test.com:80:127.0.0.1,",
|
|
"test.com", 80, FALSE, { "127.0.0.1", }
|
|
},
|
|
};
|
|
|
|
size_t i;
|
|
struct Curl_multi *multi = NULL;
|
|
struct Curl_easy *easy = NULL;
|
|
struct curl_slist *list = NULL;
|
|
|
|
for(i = 0; i < CURL_ARRAYSIZE(tests); ++i) {
|
|
size_t j;
|
|
size_t addressnum = CURL_ARRAYSIZE(tests[i].address);
|
|
struct Curl_addrinfo *addr;
|
|
struct Curl_dns_entry *dns;
|
|
void *entry_id;
|
|
bool problem = FALSE;
|
|
easy = curl_easy_init();
|
|
if(!easy)
|
|
goto error;
|
|
|
|
/* create a multi handle and add the easy handle to it so that the
|
|
hostcache is setup */
|
|
multi = curl_multi_init();
|
|
curl_multi_add_handle(multi, easy);
|
|
|
|
list = curl_slist_append(NULL, tests[i].optval);
|
|
if(!list)
|
|
goto error;
|
|
curl_easy_setopt(easy, CURLOPT_RESOLVE, list);
|
|
|
|
Curl_loadhostpairs(easy);
|
|
|
|
entry_id = (void *)curl_maprintf("%s:%d", tests[i].host, tests[i].port);
|
|
if(!entry_id)
|
|
goto error;
|
|
dns = Curl_hash_pick(&multi->dnscache.entries,
|
|
entry_id, strlen(entry_id) + 1);
|
|
curlx_safefree(entry_id);
|
|
|
|
addr = dns ? dns->addr : NULL;
|
|
|
|
for(j = 0; j < addressnum; ++j) {
|
|
uint16_t port = 0;
|
|
char ipaddress[MAX_IPADR_LEN] = { 0 };
|
|
|
|
if(!addr && !tests[i].address[j])
|
|
break;
|
|
|
|
if(tests[i].address[j] == &skip)
|
|
continue;
|
|
|
|
if(addr && !sockaddr2string(addr->ai_addr, addr->ai_addrlen,
|
|
ipaddress, &port)) {
|
|
curl_mfprintf(stderr, "%s:%d tests[%zu] failed. "
|
|
"getaddressinfo failed.\n",
|
|
__FILE__, __LINE__, i);
|
|
problem = TRUE;
|
|
break;
|
|
}
|
|
|
|
if(addr && !tests[i].address[j]) {
|
|
curl_mfprintf(stderr, "%s:%d tests[%zu] failed. the retrieved addr "
|
|
"is %s but tests[%zu].address[%zu] is NULL.\n",
|
|
__FILE__, __LINE__, i, ipaddress, i, j);
|
|
problem = TRUE;
|
|
break;
|
|
}
|
|
|
|
if(!addr && tests[i].address[j]) {
|
|
curl_mfprintf(stderr, "%s:%d tests[%zu] failed. the retrieved addr "
|
|
"is NULL but tests[%zu].address[%zu] is %s.\n",
|
|
__FILE__, __LINE__, i, i, j, tests[i].address[j]);
|
|
problem = TRUE;
|
|
break;
|
|
}
|
|
|
|
if(!curl_strequal(ipaddress, tests[i].address[j])) {
|
|
curl_mfprintf(stderr, "%s:%d tests[%zu] failed. the retrieved addr "
|
|
"%s is not equal to tests[%zu].address[%zu] %s.\n",
|
|
__FILE__, __LINE__, i, ipaddress, i, j,
|
|
tests[i].address[j]);
|
|
problem = TRUE;
|
|
break;
|
|
}
|
|
|
|
if(port != tests[i].port) {
|
|
curl_mfprintf(stderr, "%s:%d tests[%zu] failed. the retrieved port "
|
|
"for tests[%zu].address[%zu] is %d "
|
|
"but tests[%zu].port is %d.\n",
|
|
__FILE__, __LINE__, i, i, j, port, i, tests[i].port);
|
|
problem = TRUE;
|
|
break;
|
|
}
|
|
|
|
if(dns->timestamp.tv_sec && tests[i].permanent) {
|
|
curl_mfprintf(stderr,
|
|
"%s:%d tests[%zu] failed. the timestamp is not zero "
|
|
"but tests[%zu].permanent is TRUE\n",
|
|
__FILE__, __LINE__, i, i);
|
|
problem = TRUE;
|
|
break;
|
|
}
|
|
|
|
if(dns->timestamp.tv_sec == 0 && !tests[i].permanent) {
|
|
curl_mfprintf(stderr, "%s:%d tests[%zu] failed. the timestamp is zero "
|
|
"but tests[%zu].permanent is FALSE\n",
|
|
__FILE__, __LINE__, i, i);
|
|
problem = TRUE;
|
|
break;
|
|
}
|
|
|
|
if(!addr)
|
|
break;
|
|
|
|
addr = addr->ai_next;
|
|
}
|
|
|
|
curl_easy_cleanup(easy);
|
|
easy = NULL;
|
|
curl_multi_cleanup(multi);
|
|
multi = NULL;
|
|
curl_slist_free_all(list);
|
|
list = NULL;
|
|
|
|
if(problem) {
|
|
unitfail++;
|
|
continue;
|
|
}
|
|
}
|
|
error:
|
|
curl_easy_cleanup(easy);
|
|
curl_multi_cleanup(multi);
|
|
curl_slist_free_all(list);
|
|
|
|
UNITTEST_END(curl_global_cleanup())
|
|
}
|