gentoo auto-resync : 08:01:2023 - 06:15:27

3 files changed, 70 insertions, 2 deletions

diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
index 567831d3ea25..fa030d3052d8 100644
--- a/dev-lang/zig/Manifest
+++ b/dev-lang/zig/Manifest
@@ -1,4 +1,5 @@
+AUX zig-0.10.0-avoid-cmake-bug.patch 2200 BLAKE2B 6c06d318f2da258f3c003c5d8eaf66261ec736cb4ea0a87f3b0ff3d7c350bd51523ba2f23ea2bccbaed237fe76dfd6e1b56b1741a5ac6ba3539f7551e2347f70 SHA512 8e5ff85b26fe3f5a19e73aa9ad8d9f6446f936e3c2157b50212218a77747913e1199c0b52181e884755a90dfa839b23f305da82edeba6e8d3ceaff1d20a16efd
 DIST zig-0.10.0.tar.xz 14530912 BLAKE2B 5949a44ee039b7d5a163344a0fc26af8dd9cf311ed25c7092a665bb59ec7dec8dc3cd39918d81ef02c707aa8989b038fb21dfba3927fd31153a1404739b4ea3c SHA512 9d83ce51cc0ce404c06da820179c1cc47aa50e573fb1c831a96baa12c6b5226abe85b384110f2ffc4cbdc5f24eaba1f14a4e3249ffeaa248c0d73ba29859e682
-EBUILD zig-0.10.0.ebuild 2797 BLAKE2B 30422ca28bc6bbd61ac5381e59189a96916acb6963670d8ffe0a12b64ace4be8a72a55ac11af485dbe7c806f81d1aaaa1febb6fafa6ffa24704d9301bab6f1c4 SHA512 98ff2f9be1c0eb3327e7645ff3c74d010b15f4ea315fcaeb5c5fc85de5c49d96b7dffa487d1f05be256cef0791c2fb8628788572f41dda70294e70cf68edc2b8
+EBUILD zig-0.10.0.ebuild 2852 BLAKE2B bc2bbb18252167fad93698a172e9ef8ebc386481bcc4d729b9b9769463bc56a9167f86abd715a9fe0da69227d763f9df16b7c173f04bb1d966e2c501b98f6543 SHA512 bf87ad4a824921573bb39d5849b22bc6b9a22e7e706743394b43f543462aca2d067343804d7daf70fe25b968751ed9f826e2823fa02494920af2ca58398c14c3
 EBUILD zig-9999.ebuild 1671 BLAKE2B b753bbd37c7f1f60bdb2bc8fe3914d21f5b30787768460b55bd9e1980dc4727eb4f71c63a03da17a8a98c681df5e33e311b48c9c42fde8ab1b43a3bc9b3f4f90 SHA512 2b4d5a8fdfe5eba60896915b81168d5eb0aa3bcf53d6df8326c593f275556cf8652c401f0780f977325e877d36aa9348a196168f3e2c3dc3af99a8f5a1b46301
 MISC metadata.xml 541 BLAKE2B 6f5c7fbf759f0430f69073a17a0dae4b8bebf335b54c3b43da6b24104dc3de05a3b686cddbbd31e4dae1fc31695a2f08d000d22437ed6f1847de8fa95e3b1952 SHA512 d49cf0a8ad76ac9a6f6fb091effddbbcd812b56f91df6d3c782e15197cb4ff4423fb1076671a232aabcb9833af19ef8c820ad6df312a1e4d72e665680314c083
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
new file mode 100644
index 000000000000..bfc8ac3fde7f
--- /dev/null
+++ b/dev-lang/zig/files/zig-0.10.0-avoid-cmake-bug.patch
@@ -0,0 +1,63 @@
+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 <bratishkaerik@getgoogleoff.me>
+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.ebuild b/dev-lang/zig/zig-0.10.0.ebuild
index c4a1219ddb22..fbc2bd7aee94 100644
--- a/dev-lang/zig/zig-0.10.0.ebuild
+++ b/dev-lang/zig/zig-0.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -47,6 +47,10 @@ QA_FLAGS_IGNORED="usr/bin/zig"
 # (transpiled to C via C backend) for bootstrapping
 CHECKREQS_MEMORY="10G"
 
+PATCHES=(
+	"${FILESDIR}/${P}-avoid-cmake-bug.patch"
+)
+
 llvm_check_deps() {
 	has_version "sys-devel/clang:${LLVM_SLOT}"
 }