commit: f49f0e28babffcf0878268d01324397309682fd6 Author: Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me> AuthorDate: Thu Dec 1 12:43:21 2022 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Dec 1 13:57:06 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f49f0e28
dev-lang/zig: drop 0.9.1-r3 Closes: https://bugs.gentoo.org/876181 Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me> Closes: https://github.com/gentoo/gentoo/pull/28492 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-lang/zig/Manifest | 2 - .../zig-0.9.1-fix-bad-hostname-segfault.patch | 26 -------- dev-lang/zig/files/zig-0.9.1-fix-clang16.patch | 23 ------- dev-lang/zig/files/zig-0.9.1-fix-riscv.patch | 47 -------------- .../zig/files/zig-0.9.1-fix-single-threaded.patch | 13 ---- dev-lang/zig/zig-0.9.1-r3.ebuild | 72 ---------------------- 6 files changed, 183 deletions(-) diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest index fd2ecb470579..297043a711ac 100644 --- a/dev-lang/zig/Manifest +++ b/dev-lang/zig/Manifest @@ -1,3 +1 @@ DIST zig-0.10.0.tar.xz 14530912 BLAKE2B 5949a44ee039b7d5a163344a0fc26af8dd9cf311ed25c7092a665bb59ec7dec8dc3cd39918d81ef02c707aa8989b038fb21dfba3927fd31153a1404739b4ea3c SHA512 9d83ce51cc0ce404c06da820179c1cc47aa50e573fb1c831a96baa12c6b5226abe85b384110f2ffc4cbdc5f24eaba1f14a4e3249ffeaa248c0d73ba29859e682 -DIST zig-0.9.1-fix-detecting-abi.patch 22233 BLAKE2B fa523c4c4c23a74c0b4f85c6d2d91ef98b31d25694bb9dbc7988b82db972a16ab273aa9f1883cfa8ca79ef7fc56fca67d0a8656ba248b6db47bc902b7ac64a93 SHA512 259967f88f54c20f556bd9d67189ce3a2cfeb0250f0cee4dffb29020d976d61265a5dd9ae9cfcadfb7b1e152b47ee17f4184eafac2b80495f4ee8f98733cd692 -DIST zig-0.9.1.tar.xz 13940828 BLAKE2B 996b0e945f61b01dddbb7c8674a9e2d2d01b93eb48fdfd2c986496330990ffa64cba15f8bd8518b90ef6f514759ba6cc3fd31d6044c5b11b92bf92e3f7f15303 SHA512 0b8a5f9b7e34e4252536f59bc91429f1e76b2bf8e01f024095919f6ecf34db56b5c86c554fbb94bdcb5255394c87f2c87519c8f34c631f53816927ec0882ae2d diff --git a/dev-lang/zig/files/zig-0.9.1-fix-bad-hostname-segfault.patch b/dev-lang/zig/files/zig-0.9.1-fix-bad-hostname-segfault.patch deleted file mode 100644 index 2e87ecc6d6ee..000000000000 --- a/dev-lang/zig/files/zig-0.9.1-fix-bad-hostname-segfault.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://github.com/ziglang/zig/commit/601d8f721d6dc90ac390bf5ecc7d8bafdd6a30d8 -Bug https://bugs.gentoo.org/829959 - -From 601d8f721d6dc90ac390bf5ecc7d8bafdd6a30d8 Mon Sep 17 00:00:00 2001 -From: Veikka Touminen <g...@vexu.eu> -Date: Sun, 10 Jul 2022 04:27:23 -0600 -Subject: [PATCH] std.net.getAddressList: fix segfault on bad hostname - -Fixes #12065 ---- - lib/std/net.zig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/std/net.zig b/lib/std/net.zig -index 235ad8496a1..c381df9bce7 100644 ---- a/lib/std/net.zig -+++ b/lib/std/net.zig -@@ -731,7 +731,7 @@ pub fn getAddressList(allocator: mem.Allocator, name: []const u8, port: u16) !*A - break :blk result; - }; - const arena = result.arena.allocator(); -- errdefer result.arena.deinit(); -+ errdefer result.deinit(); - - if (builtin.target.os.tag == .windows or builtin.link_libc) { - const name_c = try std.cstr.addNullByte(allocator, name); diff --git a/dev-lang/zig/files/zig-0.9.1-fix-clang16.patch b/dev-lang/zig/files/zig-0.9.1-fix-clang16.patch deleted file mode 100644 index deb563378d76..000000000000 --- a/dev-lang/zig/files/zig-0.9.1-fix-clang16.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Eric Joldasov <bratishkae...@getgoogleoff.me> -Fix building with Clang 16 -Upstream PR https://github.com/ziglang/zig/pull/13121 - ---- a/src/stage1/parse_f128.c -+++ b/src/stage1/parse_f128.c -@@ -983,14 +983,14 @@ static int isspace(int c) - return c == ' ' || (unsigned)c-'\t' < 5; - } - --static inline float128_t makeInf128() { -+static inline float128_t makeInf128(void) { - union ldshape ux; - ux.i2.hi = 0x7fff000000000000UL; - ux.i2.lo = 0x0UL; - return ux.f; - } - --static inline float128_t makeNaN128() { -+static inline float128_t makeNaN128(void) { - uint64_t rand = 0UL; - union ldshape ux; - ux.i2.hi = 0x7fff000000000000UL | (rand & 0xffffffffffffUL); diff --git a/dev-lang/zig/files/zig-0.9.1-fix-riscv.patch b/dev-lang/zig/files/zig-0.9.1-fix-riscv.patch deleted file mode 100644 index 372a68ea02ad..000000000000 --- a/dev-lang/zig/files/zig-0.9.1-fix-riscv.patch +++ /dev/null @@ -1,47 +0,0 @@ -https://github.com/ziglang/zig/commit/ca3c4ff2d0afcdc8fe86e7e7b41a967c88779729 -From: Shupei Fan <dymark...@outlook.com> -zig0: properly set llvm_cpu_names and llvm_cpu_features for riscv - -Bug: https://bugs.gentoo.org/851732 - ---- a/src/stage1/zig0.cpp -+++ b/src/stage1/zig0.cpp -@@ -160,6 +160,17 @@ static void get_native_target(ZigTarget *target) { - } - } - -+static const char* get_baseline_llvm_cpu_name(ZigLLVM_ArchType arch) { -+ return ""; -+} -+ -+static const char* get_baseline_llvm_cpu_features(ZigLLVM_ArchType arch) { -+ switch (arch) { -+ case ZigLLVM_riscv64: return "+a,+c,+d,+m"; -+ default: return ""; -+ } -+} -+ - static Error target_parse_triple(struct ZigTarget *target, const char *zig_triple, const char *mcpu, - const char *dynamic_linker) - { -@@ -178,8 +189,8 @@ static Error target_parse_triple(struct ZigTarget *target, const char *zig_tripl - } else if (strcmp(mcpu, "baseline") == 0) { - target->is_native_os = false; - target->is_native_cpu = false; -- target->llvm_cpu_name = ""; -- target->llvm_cpu_features = ""; -+ target->llvm_cpu_name = get_baseline_llvm_cpu_name(target->arch); -+ target->llvm_cpu_features = get_baseline_llvm_cpu_features(target->arch); - } else { - const char *msg = "stage0 can't handle CPU/features in the target"; - stage2_panic(msg, strlen(msg)); -@@ -220,6 +231,9 @@ static Error target_parse_triple(struct ZigTarget *target, const char *zig_tripl - const char *msg = "stage0 can't handle CPU/features in the target"; - stage2_panic(msg, strlen(msg)); - } -+ -+ target->llvm_cpu_name = get_baseline_llvm_cpu_name(target->arch); -+ target->llvm_cpu_features = get_baseline_llvm_cpu_features(target->arch); - } - - return ErrorNone; diff --git a/dev-lang/zig/files/zig-0.9.1-fix-single-threaded.patch b/dev-lang/zig/files/zig-0.9.1-fix-single-threaded.patch deleted file mode 100644 index 70f807f2d550..000000000000 --- a/dev-lang/zig/files/zig-0.9.1-fix-single-threaded.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 638f39f7e..791477c41 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -787,7 +787,7 @@ else() - set(ZIG1_RELEASE_ARG -OReleaseFast --strip) - endif() - if(ZIG_SINGLE_THREADED) -- set(ZIG1_SINGLE_THREADED_ARG "-fsingle-threaded") -+ set(ZIG1_SINGLE_THREADED_ARG "--single-threaded") - else() - set(ZIG1_SINGLE_THREADED_ARG "") - endif() diff --git a/dev-lang/zig/zig-0.9.1-r3.ebuild b/dev-lang/zig/zig-0.9.1-r3.ebuild deleted file mode 100644 index 463cead06e2d..000000000000 --- a/dev-lang/zig/zig-0.9.1-r3.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 2019-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_MAX_SLOT=13 -inherit cmake llvm check-reqs - -DESCRIPTION="A robust, optimal, and maintainable programming language" -HOMEPAGE="https://ziglang.org/"; -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/ziglang/zig.git"; - inherit git-r3 -else - SRC_URI="https://ziglang.org/download/${PV}/${P}.tar.xz"; - KEYWORDS="~amd64 ~arm ~arm64" -fi - -SRC_URI+=" https://codeberg.org/BratishkaErik/distfiles/media/branch/master/zig-0.9.1-fix-detecting-abi.patch"; -LICENSE="MIT" -SLOT="0" -IUSE="test +threads" -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/${P}-fix-clang16.patch" - "${FILESDIR}/${P}-fix-single-threaded.patch" - "${FILESDIR}/${P}-fix-riscv.patch" - "${FILESDIR}/${P}-fix-bad-hostname-segfault.patch" - "${DISTDIR}/zig-0.9.1-fix-detecting-abi.patch" -) - -BUILD_DIR="${S}/build" - -DEPEND=" - sys-devel/clang:${LLVM_MAX_SLOT}= - sys-devel/lld:${LLVM_MAX_SLOT}= - sys-devel/llvm:${LLVM_MAX_SLOT}= - >=sys-libs/zlib-1.2.12 -" - -RDEPEND="${DEPEND} - !dev-lang/zig-bin -" - -llvm_check_deps() { - has_version "sys-devel/clang:${LLVM_SLOT}" -} - -# see https://github.com/ziglang/zig/wiki/Troubleshooting-Build-Issues#high-memory-requirements -CHECKREQS_MEMORY="10G" - -pkg_setup() { - llvm_pkg_setup - check-reqs_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DZIG_USE_CCACHE=OFF - -DZIG_PREFER_CLANG_CPP_DYLIB=ON - -DZIG_SINGLE_THREADED="$(usex !threads)" - -DCMAKE_PREFIX_PATH=$(get_llvm_prefix ${LLVM_MAX_SLOT}) - ) - - cmake_src_configure -} - -src_test() { - cd "${BUILD_DIR}" || die - ./zig build test || die -}
