commit: dcd8eff6fdeca24dc34ac1ff2e78cfe281f3314e Author: BratishkaErik <bratishkaerik <AT> getgoogleoff <DOT> me> AuthorDate: Sun Jul 10 08:11:40 2022 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Fri Jul 15 08:41:09 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcd8eff6
dev-lang/zig: enable LLVM 14 on -9999 Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me> Closes: https://github.com/gentoo/gentoo/pull/26320 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> dev-lang/zig/files/zig-9999-stage2-fix.patch | 4 ++-- dev-lang/zig/zig-9999.ebuild | 14 +++----------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/dev-lang/zig/files/zig-9999-stage2-fix.patch b/dev-lang/zig/files/zig-9999-stage2-fix.patch index 520be382c562..610ab6b86623 100644 --- a/dev-lang/zig/files/zig-9999-stage2-fix.patch +++ b/dev-lang/zig/files/zig-9999-stage2-fix.patch @@ -1,8 +1,8 @@ diff --git a/build.zig b/build.zig -index 4d3cf49..4601935 100644 +index ac0a161..12f7e15 100644 --- a/build.zig +++ b/build.zig -@@ -550,6 +550,7 @@ fn addCmakeCfgOptionsToExe( +@@ -562,6 +562,7 @@ fn addCmakeCfgOptionsToExe( else => |e| return e, }; exe.linkSystemLibrary("unwind"); diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild index 87dc59b0c0c7..c081a14b93c0 100644 --- a/dev-lang/zig/zig-9999.ebuild +++ b/dev-lang/zig/zig-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -LLVM_MAX_SLOT=13 +LLVM_MAX_SLOT=14 inherit cmake llvm check-reqs DESCRIPTION="A robust, optimal, and maintainable programming language" @@ -23,20 +23,12 @@ RESTRICT="!test? ( test )" BUILD_DIR="${S}/build" -# According to zig's author, zig builds that do not support all targets are not -# supported by the upstream project. -ALL_LLVM_TARGETS=( - AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 NVPTX - PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore -) -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) -LLVM_TARGET_USEDEPS="${ALL_LLVM_TARGETS[@]}" - RDEPEND=" sys-devel/clang:${LLVM_MAX_SLOT} >=sys-devel/lld-${LLVM_MAX_SLOT} <sys-devel/lld-$((${LLVM_MAX_SLOT} + 1)) - sys-devel/llvm:${LLVM_MAX_SLOT}[${LLVM_TARGET_USEDEPS// /,}] + sys-devel/llvm:${LLVM_MAX_SLOT} + >=sys-libs/zlib-1.2.12 " DEPEND="${RDEPEND}"
