mirror of
https://github.com/open-goal/jak-project
synced 2026-08-20 14:24:45 -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)
182 lines
5.9 KiB
C
Vendored
Generated
182 lines
5.9 KiB
C
Vendored
Generated
#ifndef HEADER_SERVER_FIRST_H
|
|
#define HEADER_SERVER_FIRST_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* 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
|
|
*
|
|
***************************************************************************/
|
|
|
|
/* Test servers are standalone programs that do not use libcurl
|
|
* library. For convenience and to ease portability of these servers,
|
|
* some source code files from the libcurl subdirectory are also used
|
|
* to build the servers. In order to achieve proper linkage of these
|
|
* files on Windows targets it is necessary to build the test servers
|
|
* with CURL_STATICLIB defined, independently of how libcurl is built.
|
|
* For other platforms, this macro is a no-op and safe to set.
|
|
*/
|
|
#define CURL_STATICLIB
|
|
|
|
#define WITHOUT_LIBCURL
|
|
#define CURL_NO_OLDIES
|
|
|
|
#include "curl_setup.h"
|
|
|
|
typedef int (*entry_func_t)(int, const char **);
|
|
|
|
struct entry_s {
|
|
const char *name;
|
|
entry_func_t ptr;
|
|
};
|
|
|
|
extern const struct entry_s s_entries[];
|
|
|
|
#include <signal.h>
|
|
#ifdef HAVE_NETINET_IN_H
|
|
#include <netinet/in.h>
|
|
#endif
|
|
#ifdef HAVE_NETINET_IN6_H
|
|
#include <netinet/in6.h>
|
|
#endif
|
|
#ifdef HAVE_ARPA_INET_H
|
|
#include <arpa/inet.h>
|
|
#endif
|
|
#ifdef HAVE_NETDB_H
|
|
#include <netdb.h>
|
|
#endif
|
|
|
|
#include "curlx/base64.h" /* for curlx_base64* */
|
|
#include "curlx/fopen.h" /* for curlx_f*() */
|
|
#include "curlx/inet_ntop.h" /* for curlx_inet_ntop() */
|
|
#include "curlx/inet_pton.h" /* for curlx_inet_pton() */
|
|
#include "curlx/nonblock.h" /* for curlx_nonblock() */
|
|
#include "curlx/strcopy.h" /* for curlx_strcopy() */
|
|
#include "curlx/strerr.h" /* for curlx_strerror() */
|
|
#include "curlx/strparse.h" /* for curlx_str_* parsing functions */
|
|
#include "curlx/timediff.h" /* for timediff_t type and related functions */
|
|
#include "curlx/timeval.h" /* for curlx_now type and related functions */
|
|
#include "curlx/wait.h" /* for curlx_wait_ms() */
|
|
#include "curlx/winapi.h" /* for curlx_winapi_strerror() */
|
|
|
|
#ifdef _WIN32
|
|
#include <curlx/snprintf.h>
|
|
#define snprintf curlx_win32_snprintf
|
|
#endif
|
|
|
|
#ifdef _WIN32
|
|
# define CURL_STRNICMP(p1, p2, n) _strnicmp(p1, p2, n)
|
|
#elif defined(HAVE_STRCASECMP)
|
|
# ifdef HAVE_STRINGS_H
|
|
# include <strings.h>
|
|
# endif
|
|
# define CURL_STRNICMP(p1, p2, n) strncasecmp(p1, p2, n)
|
|
#elif defined(HAVE_STRCMPI)
|
|
# define CURL_STRNICMP(p1, p2, n) strncmpi(p1, p2, n)
|
|
#elif defined(HAVE_STRICMP)
|
|
# define CURL_STRNICMP(p1, p2, n) strnicmp(p1, p2, n)
|
|
#else
|
|
# error "missing case insensitive comparison function"
|
|
#endif
|
|
|
|
enum {
|
|
DOCNUMBER_NOTHING = -7,
|
|
DOCNUMBER_QUIT = -6,
|
|
DOCNUMBER_BADCONNECT = -5,
|
|
DOCNUMBER_INTERNAL = -4,
|
|
DOCNUMBER_CONNECT = -3,
|
|
DOCNUMBER_WERULEZ = -2,
|
|
DOCNUMBER_404 = -1
|
|
};
|
|
|
|
#ifdef USE_UNIX_SOCKETS
|
|
#ifdef HAVE_SYS_UN_H
|
|
#include <sys/un.h> /* for sockaddr_un */
|
|
#endif
|
|
#endif /* USE_UNIX_SOCKETS */
|
|
|
|
typedef union {
|
|
struct sockaddr sa;
|
|
struct sockaddr_in sa4;
|
|
#ifdef USE_IPV6
|
|
struct sockaddr_in6 sa6;
|
|
#endif
|
|
#ifdef USE_UNIX_SOCKETS
|
|
struct sockaddr_un sau;
|
|
#endif
|
|
} srvr_sockaddr_union_t;
|
|
|
|
/* getpart */
|
|
#define GPE_NO_BUFFER_SPACE (-2)
|
|
#define GPE_OUT_OF_MEMORY (-1)
|
|
#define GPE_OK 0
|
|
#define GPE_END_OF_FILE 1
|
|
|
|
extern int getpart(char **outbuf, size_t *outlen,
|
|
const char *main, const char *sub, FILE *stream);
|
|
|
|
/* utility functions */
|
|
extern void logmsg(const char *msg, ...) CURL_PRINTF(1, 2);
|
|
extern void loghex(const unsigned char *buffer, ssize_t len);
|
|
extern int win32_init(void);
|
|
extern FILE *test2fopen(long testno, const char *logdir2);
|
|
extern curl_off_t our_getpid(void);
|
|
extern int write_pidfile(const char *filename);
|
|
extern int write_portfile(const char *filename, int port);
|
|
extern void set_advisor_read_lock(const char *filename);
|
|
extern void clear_advisor_read_lock(const char *filename);
|
|
extern void storerequest(const char *reqbuf, size_t totalsize,
|
|
const char *filename);
|
|
static volatile int got_exit_signal = 0;
|
|
static volatile int exit_signal = 0;
|
|
#ifdef _WIN32
|
|
static HANDLE exit_event = NULL;
|
|
#endif
|
|
extern void install_signal_handlers(bool keep_sigalrm);
|
|
extern void restore_signal_handlers(bool keep_sigalrm);
|
|
#ifdef USE_UNIX_SOCKETS
|
|
extern int bind_unix_socket(curl_socket_t sock, const char *unix_socket,
|
|
struct sockaddr_un *sau);
|
|
#endif
|
|
extern curl_socket_t sockdaemon(curl_socket_t sock,
|
|
unsigned short *listenport,
|
|
const char *unix_socket,
|
|
bool bind_only);
|
|
|
|
/* global variables */
|
|
static const char *srcpath = "."; /* pointing to the test directory */
|
|
static const char *pidname = NULL;
|
|
static const char *portname = NULL; /* none by default */
|
|
static const char *serverlogfile = NULL;
|
|
static int serverlogslocked;
|
|
static const char *configfile = NULL;
|
|
static const char *logdir = "log";
|
|
static char loglockfile[256];
|
|
#ifdef USE_IPV6
|
|
static bool use_ipv6 = FALSE;
|
|
#endif
|
|
static const char *ipv_inuse = "IPv4";
|
|
static unsigned short server_port = 0;
|
|
static const char *socket_type = "IPv4";
|
|
static int socket_domain = AF_INET;
|
|
|
|
#define SERVERLOGS_LOCKDIR "lock" /* within logdir */
|
|
|
|
#endif /* HEADER_SERVER_FIRST_H */
|