diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eb968774..5a15acd4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,8 @@ env: UPX_DEBUG_TEST_LIBC_QSORT: 1 ZSTD_CLEVEL: 17 # 2025-08-19 - ZIG_DIST_VERSION: 0.15.1 + #ZIG_DIST_VERSION: 0.15.1 + ZIG_DIST_VERSION: zig-0.16.0-dev.600+12ed0ff1e jobs: job-rebuild-and-verify-stubs: @@ -656,9 +657,9 @@ jobs: ZIG_DIST_VERSION=${ZIG_DIST_VERSION/#zig-/} ZIG_DIST_NAME=zig-linux-x86_64-${ZIG_DIST_VERSION} ZIG_DIST_NAME=zig-x86_64-linux-${ZIG_DIST_VERSION} - #curl -sS -L -O https://ziglang.org/builds/${ZIG_DIST_NAME}.tar.xz + curl -sS -L -O https://ziglang.org/builds/${ZIG_DIST_NAME}.tar.xz #curl -sS -L -O https://ziglang.org/download/0.14.1/${ZIG_DIST_NAME}.tar.xz - curl -sS -L -O https://ziglang.org/download/0.15.1/${ZIG_DIST_NAME}.tar.xz + #curl -sS -L -O https://ziglang.org/download/0.15.1/${ZIG_DIST_NAME}.tar.xz ls -l ${ZIG_DIST_NAME}.tar.xz file ${ZIG_DIST_NAME}.tar.xz || true tar -xoJf ${ZIG_DIST_NAME}.tar.xz diff --git a/misc/patches/zig/0001-x.patch b/misc/patches/zig/0001-x.patch index 56f7da8c..f98dd31f 100644 --- a/misc/patches/zig/0001-x.patch +++ b/misc/patches/zig/0001-x.patch @@ -11,12 +11,13 @@ diff --git a/lib/libcxx/include/__config b/lib/libcxx/include/__config index fec323f..a16d145 100644 --- a/lib/libcxx/include/__config +++ b/lib/libcxx/include/__config -@@ -637,9 +637,11 @@ typedef __char32_t char32_t; +@@ -637,9 +637,12 @@ typedef __char32_t char32_t; # define _DECLARE_C99_LDBL_MATH 1 # endif +# if defined(_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION) +# define _LIBCPP_HAS_LIBRARY_ALIGNED_ALLOCATION 0 ++# elif defined(_LIBCPP_HAS_LIBRARY_ALIGNED_ALLOCATION) // If we are getting operator new from the MSVC CRT, then allocation overloads // for align_val_t were added in 19.12, aka VS 2017 version 15.3. -# if defined(_LIBCPP_MSVCRT) && defined(_MSC_VER) && _MSC_VER < 1912