commit: 67e28ad1e4320b9ecb7b4f1925cd328252bd2a65 Author: Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me> AuthorDate: Thu Mar 16 15:03:10 2023 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Fri Mar 17 09:44:24 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67e28ad1
dev-lang/zig: drop 0.10.0-r1, 0.10.1 Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me> Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> dev-lang/zig/Manifest | 1 - .../zig/files/zig-0.10.0-avoid-cmake-bug.patch | 63 ------------- dev-lang/zig/zig-0.10.0-r1.ebuild | 101 --------------------- dev-lang/zig/zig-0.10.1.ebuild | 99 -------------------- 4 files changed, 264 deletions(-) diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest index 22f469292044..529aa0c2bc35 100644 --- a/dev-lang/zig/Manifest +++ b/dev-lang/zig/Manifest @@ -1,2 +1 @@ -DIST zig-0.10.0.tar.xz 14530912 BLAKE2B 5949a44ee039b7d5a163344a0fc26af8dd9cf311ed25c7092a665bb59ec7dec8dc3cd39918d81ef02c707aa8989b038fb21dfba3927fd31153a1404739b4ea3c SHA512 9d83ce51cc0ce404c06da820179c1cc47aa50e573fb1c831a96baa12c6b5226abe85b384110f2ffc4cbdc5f24eaba1f14a4e3249ffeaa248c0d73ba29859e682 DIST zig-0.10.1.tar.xz 15143112 BLAKE2B 4954d95ad763000eedf73a78e62bc0e99d65bba91c7127cdf1ea4503eb67817265daf572f645b7efbe9e24087e690b2768f0b2bc6c43b5fd76eab33143e964fe SHA512 d443adf61556bc95470537c6b0371a0ac99d19a06b15635cf1e5055ae7849039680c9006105e06e1bd6ba0fc12da14c54c1d28ac597c7dee17ee3a5cd9cf79f8 diff --git a/dev-lang/zig/files/zig-0.10.0-avoid-cmake-bug.patch b/dev-lang/zig/files/zig-0.10.0-avoid-cmake-bug.patch deleted file mode 100644 index bfc8ac3fde7f..000000000000 --- a/dev-lang/zig/files/zig-0.10.0-avoid-cmake-bug.patch +++ /dev/null @@ -1,63 +0,0 @@ -https://github.com/ziglang/zig/commit/fe2bd9dda8467b775da4fe3bd535aece9e07ee1b -Bug https://bugs.gentoo.org/886569 - -From fe2bd9dda8467b775da4fe3bd535aece9e07ee1b Mon Sep 17 00:00:00 2001 -From: Eric Joldasov <[email protected]> -Date: Wed, 4 Jan 2023 01:04:48 +0600 -Subject: [PATCH] cmake: move 'continue' statement to avoid cmake bug - ---- - cmake/Findllvm.cmake | 32 +++++++++++--------------------- - 1 file changed, 11 insertions(+), 21 deletions(-) - -diff --git a/cmake/Findllvm.cmake b/cmake/Findllvm.cmake -index 60a52056d8d..d8662034579 100644 ---- a/cmake/Findllvm.cmake -+++ b/cmake/Findllvm.cmake -@@ -79,7 +79,11 @@ if(ZIG_USE_LLVM_CONFIG) - OUTPUT_VARIABLE LLVM_TARGETS_BUILT_SPACES - OUTPUT_STRIP_TRAILING_WHITESPACE) - string(REPLACE " " ";" LLVM_TARGETS_BUILT "${LLVM_TARGETS_BUILT_SPACES}") -- function(NEED_TARGET TARGET_NAME) -+ -+ set(ZIG_LLVM_REQUIRED_TARGETS "AArch64;AMDGPU;ARM;AVR;BPF;Hexagon;Lanai;Mips;MSP430;NVPTX;PowerPC;RISCV;Sparc;SystemZ;VE;WebAssembly;X86;XCore") -+ -+ set(ZIG_LLVM_REQUIRED_TARGETS_ENABLED TRUE) -+ foreach(TARGET_NAME IN LISTS ZIG_LLVM_REQUIRED_TARGETS) - list (FIND LLVM_TARGETS_BUILT "${TARGET_NAME}" _index) - if (${_index} EQUAL -1) - # Save the error message, in case this is the last llvm-config we find -@@ -87,27 +91,13 @@ if(ZIG_USE_LLVM_CONFIG) - - # Ignore this directory and try the search again - list(APPEND CMAKE_IGNORE_PATH "${LLVM_CONFIG_DIR}") -- continue() -+ set(ZIG_LLVM_REQUIRED_TARGETS_ENABLED FALSE) -+ break() - endif() -- endfunction(NEED_TARGET) -- NEED_TARGET("AArch64") -- NEED_TARGET("AMDGPU") -- NEED_TARGET("ARM") -- NEED_TARGET("AVR") -- NEED_TARGET("BPF") -- NEED_TARGET("Hexagon") -- NEED_TARGET("Lanai") -- NEED_TARGET("Mips") -- NEED_TARGET("MSP430") -- NEED_TARGET("NVPTX") -- NEED_TARGET("PowerPC") -- NEED_TARGET("RISCV") -- NEED_TARGET("Sparc") -- NEED_TARGET("SystemZ") -- NEED_TARGET("VE") -- NEED_TARGET("WebAssembly") -- NEED_TARGET("X86") -- NEED_TARGET("XCore") -+ endforeach() -+ if (NOT ZIG_LLVM_REQUIRED_TARGETS_ENABLED) -+ continue() -+ endif() - - # Got it! - break() diff --git a/dev-lang/zig/zig-0.10.0-r1.ebuild b/dev-lang/zig/zig-0.10.0-r1.ebuild deleted file mode 100644 index 4d9a45ee5fb0..000000000000 --- a/dev-lang/zig/zig-0.10.0-r1.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 2019-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_MAX_SLOT=15 -inherit edo 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 - -LICENSE="MIT" -SLOT="0" - -BUILD_DIR="${S}/build" - -# Zig requires zstd and zlib compression support in LLVM, if using LLVM backend. -# (non-LLVM backends don't require these) -# They are not required "on their own", so please don't add them here. -# You can check https://github.com/ziglang/zig-bootstrap in future, to see -# options that are passed to LLVM CMake building (excluding "static" ofc). -DEPEND=" - sys-devel/clang:${LLVM_MAX_SLOT}= - sys-devel/lld:${LLVM_MAX_SLOT}= - sys-devel/llvm:${LLVM_MAX_SLOT}=[zstd] -" - -RDEPEND=" - ${DEPEND} - !dev-lang/zig-bin -" - -# see https://github.com/ziglang/zig/issues/3382 -# For now, Zig doesn't support CFLAGS/LDFLAGS/etc. -QA_FLAGS_IGNORED="usr/bin/zig" - -# see https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler -# 0.10.0 release - ~9.6 GiB, since we use compiler written in C++ for bootstrapping -# 0.11.0 release - ~2.8 GiB, since we will (at least according to roadmap) use self-hosted compiler -# (transpiled to C via C backend) for bootstrapping -CHECKREQS_MEMORY="10G" - -PATCHES=( - "${FILESDIR}/${P}-avoid-cmake-bug.patch" - "${FILESDIR}/${P}-build-dir-install-stage3.patch" -) - -llvm_check_deps() { - has_version "sys-devel/clang:${LLVM_SLOT}" -} - -pkg_setup() { - llvm_pkg_setup - ewarn "This version requires 10G of memory for building compiler." - ewarn "If you don't have enough memory, you can wait until 0.11.0 release" - ewarn "or (if you are risky) use 9999 version (currently requires only 4GB)" - check-reqs_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DZIG_USE_CCACHE=OFF - -DZIG_SHARED_LLVM=ON - -DCMAKE_PREFIX_PATH=$(get_llvm_prefix ${LLVM_MAX_SLOT}) - ) - - cmake_src_configure -} - -src_test() { - cd "${BUILD_DIR}" || die - local ZIG_TEST_ARGS="-Dstatic-llvm=false -Denable-llvm=true -Dskip-non-native=true -Drelease -Dtarget=native" - local ZIG_TEST_STEPS=( - test-cases test-fmt test-behavior test-compiler-rt test-universal-libc test-compare-output - test-standalone test-c-abi test-link test-stack-traces test-cli test-asm-link test-translate-c - test-run-translated-c test-std - ) - - local step - for step in "${ZIG_TEST_STEPS[@]}" ; do - edob ./stage3/bin/zig build ${step} ${ZIG_TEST_ARGS} - done -} - -pkg_postinst() { - elog "0.10.0 release introduces self-hosted compiler for general use by default" - elog "It means that your code can be un-compilable since this compiler has some new or removed features and new or fixed bugs" - elog "Upstream recommends:" - elog " * Using old compiler if experiencing such breakage (flag '-fstage1')" - elog " * Waiting for bugfix release 0.10.1" - elog " * Waiting for release 0.11.0 with old compiler removed (these changes are already merged in 9999)" - elog "Also see: https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler"; - elog "and https://ziglang.org/download/0.10.0/release-notes.html#How-to-Upgrade"; -} diff --git a/dev-lang/zig/zig-0.10.1.ebuild b/dev-lang/zig/zig-0.10.1.ebuild deleted file mode 100644 index b5ed03b123f1..000000000000 --- a/dev-lang/zig/zig-0.10.1.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 2019-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_MAX_SLOT=15 -inherit edo 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 - -LICENSE="MIT" -SLOT="0" - -BUILD_DIR="${S}/build" - -# Zig requires zstd and zlib compression support in LLVM, if using LLVM backend. -# (non-LLVM backends don't require these) -# They are not required "on their own", so please don't add them here. -# You can check https://github.com/ziglang/zig-bootstrap in future, to see -# options that are passed to LLVM CMake building (excluding "static" ofc). -DEPEND=" - sys-devel/clang:${LLVM_MAX_SLOT}= - sys-devel/lld:${LLVM_MAX_SLOT}= - sys-devel/llvm:${LLVM_MAX_SLOT}=[zstd] -" - -RDEPEND=" - ${DEPEND} - !dev-lang/zig-bin -" - -# see https://github.com/ziglang/zig/issues/3382 -# For now, Zig doesn't support CFLAGS/LDFLAGS/etc. -QA_FLAGS_IGNORED="usr/bin/zig" - -# see https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler -# 0.10.0 release - ~9.6 GiB, since we use compiler written in C++ for bootstrapping -# 0.11.0 release - ~2.8 GiB, since we will (at least according to roadmap) use self-hosted compiler -# (transpiled to C via C backend) for bootstrapping -CHECKREQS_MEMORY="10G" - -PATCHES=( - "${FILESDIR}/zig-0.10.0-build-dir-install-stage3.patch" -) - -llvm_check_deps() { - has_version "sys-devel/clang:${LLVM_SLOT}" -} - -pkg_setup() { - llvm_pkg_setup - ewarn "This version requires 10G of memory for building compiler." - ewarn "If you don't have enough memory, you can wait until 0.11.0 release" - ewarn "or (if you are risky) use 9999 version (currently requires only 4GB)" - check-reqs_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DZIG_USE_CCACHE=OFF - -DZIG_SHARED_LLVM=ON - -DCMAKE_PREFIX_PATH=$(get_llvm_prefix ${LLVM_MAX_SLOT}) - ) - - cmake_src_configure -} - -src_test() { - cd "${BUILD_DIR}" || die - local ZIG_TEST_ARGS="-Dstatic-llvm=false -Denable-llvm=true -Dskip-non-native=true -Drelease -Dtarget=native" - local ZIG_TEST_STEPS=( - test-cases test-fmt test-behavior test-compiler-rt test-universal-libc test-compare-output - test-standalone test-c-abi test-link test-stack-traces test-cli test-asm-link test-translate-c - test-run-translated-c test-std - ) - - local step - for step in "${ZIG_TEST_STEPS[@]}" ; do - edob ./stage3/bin/zig build ${step} ${ZIG_TEST_ARGS} - done -} - -pkg_postinst() { - elog "0.10.1 release uses self-hosted compiler by default and fixes some bugs from 0.10.0" - elog "But your code still can be un-compilable since some features still not implemented or bugs not fixed" - elog "Upstream recommends:" - elog " * Using old compiler if experiencing such breakage (flag '-fstage1')" - elog " * Waiting for release 0.11.0 with old compiler removed (these changes are already merged in 9999)" - elog "Also see: https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler"; - elog "and https://ziglang.org/download/0.10.0/release-notes.html#How-to-Upgrade"; -}
