From 79bbb4b00fd562c67e06650c8b0e446064065879 Mon Sep 17 00:00:00 2001 From: daurnimator Date: Fri, 13 Sep 2024 16:48:23 +1000 Subject: [PATCH] zig: bump to 0.13.0 --- packages/zig/Containerfile | 6 ++---- packages/zig/static-glibc.patch | 17 ----------------- 2 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 packages/zig/static-glibc.patch diff --git a/packages/zig/Containerfile b/packages/zig/Containerfile index 0164515..ff4ee8b 100644 --- a/packages/zig/Containerfile +++ b/packages/zig/Containerfile @@ -1,12 +1,11 @@ FROM scratch AS base -ENV VERSION=0.11.0 -ENV SRC_HASH=72014e700e50c0d3528cef3adf80b76b26ab27730133e8202716a187a799e951 +ENV VERSION=0.13.0 +ENV SRC_HASH=06c73596beeccb71cc073805bdb9c0e05764128f16478fa53bf17dfabc1d4318 ENV SRC_FILE=zig-${VERSION}.tar.xz ENV SRC_SITE=https://ziglang.org/download/${VERSION}/${SRC_FILE} FROM base AS fetch ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} . -COPY static-glibc.patch . FROM fetch AS build COPY --from=stagex/binutils . / @@ -24,7 +23,6 @@ COPY --from=stagex/zlib . / RUN --network=none tar -xf ${SRC_FILE} WORKDIR /zig-${VERSION} -RUN --network=none patch -p1 -i ../static-glibc.patch RUN --network=none <<-EOF set -eux cmake -Bbuild \ diff --git a/packages/zig/static-glibc.patch b/packages/zig/static-glibc.patch deleted file mode 100644 index 4aa33f3..0000000 --- a/packages/zig/static-glibc.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9c06d24715..26777640d8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -906,11 +906,7 @@ if(ZIG_SINGLE_THREADED) - else() - set(ZIG_SINGLE_THREADED_ARG "") - endif() --if(ZIG_STATIC AND NOT MSVC) -- set(ZIG_STATIC_ARG "-Duse-zig-libcxx") --else() -- set(ZIG_STATIC_ARG "") --endif() -+set(ZIG_STATIC_ARG "") - - if(CMAKE_POSITION_INDEPENDENT_CODE OR ZIG_PIE) - set(ZIG_PIE_ARG "-Dpie") \ No newline at end of file