gentoo auto-resync : 22:08:2022 - 14:43:09

5 files changed, 82 insertions, 29 deletions

diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
index 7c345a0fddb0..28010e6d307c 100644
--- a/dev-lang/zig/Manifest
+++ b/dev-lang/zig/Manifest
@@ -1,6 +1,7 @@
+AUX zig-0.9.1-fix-riscv.patch 1853 BLAKE2B 0d0c9e1d639ed1a5228ad7db3182f848d9f6deba0e8e091d993256b90fdf152def7f80446ba19aeee0bd4c6d6a87dfcba5df311a54ede2b79510b6552cb2da9c SHA512 5c85a7fed80b5d157c99f80cf9971cdd91c93477de49ad01d163956ebc17d267d6a0002212fe16f5ca04b35c96e5f4721d1be44c6f4955429940763d924cc92f
 AUX zig-0.9.1-fix-single-threaded.patch 390 BLAKE2B 443a5ab709aa90ed92636310c204a15cbb60a997ff39f7f7102fdd4f21f66e64bd79516653729ecbd719aeb39809457c3db2d1c3c9d0614d1fb637307cc2a892 SHA512 f4e6f87a3aae5380c3f3e1eda85f10914119a378dd08c8375d18dd038dc0b131234a62fd86f46f64cd2038e5abd787e4a7876929fceac85b01bd6e4bce3b3263
 AUX zig-9999-stage2-fix.patch 474 BLAKE2B c19bbe2200e4f2bdbc41af2ae303bd105ae728726fe77f90b21d0e16734ae5623e69ddd08e2e57f6b9215a4b319cae870da1e3d8a8d92fd909aac53ff7a3d062 SHA512 af7f7b00fda2492df643e0119aed1287580900eeccc0c03df3089e186a8797878da0a3ce6e7f2149d37454c0d1ea2fbd512c6885afa56939a677c06b5f624c9a
 DIST zig-0.9.1.tar.xz 13940828 BLAKE2B 996b0e945f61b01dddbb7c8674a9e2d2d01b93eb48fdfd2c986496330990ffa64cba15f8bd8518b90ef6f514759ba6cc3fd31d6044c5b11b92bf92e3f7f15303 SHA512 0b8a5f9b7e34e4252536f59bc91429f1e76b2bf8e01f024095919f6ecf34db56b5c86c554fbb94bdcb5255394c87f2c87519c8f34c631f53816927ec0882ae2d
-EBUILD zig-0.9.1.ebuild 1654 BLAKE2B 9ef9f83c3a69a6d7757c964a1f4b3e1109de98654bc40951e95bd99278ae0e20e80c5468a4b8156358e773478eccc3f536e896a95718f00ee6a8dcecf267f218 SHA512 622061b326afd67878d20385af2d06f50b475f1372f64668d85954adde9f5033313f44923877bf95e5bd99e85901d19e7ddc36f2bf4915250ca2bcd5885297c9
-EBUILD zig-9999.ebuild 1953 BLAKE2B cc493915fb9503bd158f5fd20537adc74ad9a33fb508098942dc47eb1d90091ff2dbcc2f84855d1e603a66c8ae67e15a2181878642e1d36611d65f2a442c5bf5 SHA512 b2e005745d20552a7cdbc27664903f946fd8e325a93b256f6c62d4439a905239f89ef1bc48a15714912211c0e8e8c93cdb63731585095c09b30883ba3add5e9c
-MISC metadata.xml 439 BLAKE2B 0284fd16d5ea4cf989e1558a5194d777c17ff976f8f69c97f3a245f5c412733ba0eaf4c9cdfea6b618988430e01e545d0a0016b6f3017614194a5152a66c2f59 SHA512 a7b020d023d41ac30bfc3cd2344ae176d49d3f7c43b284f4675588b089de388c4e631c4216758b6ba8b12497b28761a41165562cdf50a48cab15784bcb9c3396
+EBUILD zig-0.9.1.ebuild 1345 BLAKE2B 6a7b7477f9e3d8c7b54a1352870d844b3eb5655baf02fa1491c008f53591137db0347323fabdb549c97085ca67f85c7c3ffc48e7182ab8ebfb041bd234a44166 SHA512 eb3df8a8e086406305c2e00409cbf309a9cc7d518e6776360ecf6916b2a641a3640bb5321d264ccf0f454beda000d57762d81114dab0e0d1f7629c98c8d5edbf
+EBUILD zig-9999.ebuild 1948 BLAKE2B a879467157e916464a5bd0848ab526495b22d6eca6f0a48ac289430cf045ef7d646d621b1814e5fff38984dcd87b126dd58989f54a74ef4734df0c42b6b72ba8 SHA512 52093e14f2ac2cc4e8fa11ebb1abb6f14d555dbb9f74a15c32bb26007f27e17f312dc05ce84a58b68f3e906cb16bfdefab223d3326a13c02fa95b672405f8dd9
+MISC metadata.xml 677 BLAKE2B d9a07783f0c9115f17c1125630fbb00be6a388e6d5526c44723795fe36884ec8123c1e4dc976f8c8347946e6f9f4249d0607978b4f0c4f6672d77f55b4fa0f23 SHA512 db452c01358b9d47695d79b360312b7f6f242e9c288dbb8f327684ba65913aec2e8250fe3cc0dba89d6831f63860bdbb67c041db7b3f89b84a0a6dc7789da222
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
new file mode 100644
index 000000000000..372a68ea02ad
--- /dev/null
+++ b/dev-lang/zig/files/zig-0.9.1-fix-riscv.patch
@@ -0,0 +1,47 @@
+https://github.com/ziglang/zig/commit/ca3c4ff2d0afcdc8fe86e7e7b41a967c88779729
+From: Shupei Fan <dymarkfan@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/metadata.xml b/dev-lang/zig/metadata.xml
index e74e7f06b800..c12ebabd226e 100644
--- a/dev-lang/zig/metadata.xml
+++ b/dev-lang/zig/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>bratishkaerik@getgoogleoff.me</email>
+		<name>Eric Joldasov</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="stage2">Install stage2 compiler (written in Zig) alongside stage1 compiler (written in C++ and Zig)</flag>
 	</use>
diff --git a/dev-lang/zig/zig-0.9.1.ebuild b/dev-lang/zig/zig-0.9.1.ebuild
index 18dd79a4bbad..0c78b3e76b08 100644
--- a/dev-lang/zig/zig-0.9.1.ebuild
+++ b/dev-lang/zig/zig-0.9.1.ebuild
@@ -21,26 +21,24 @@ SLOT="0"
 IUSE="test +threads"
 RESTRICT="!test? ( test )"
 
-PATCHES=("${FILESDIR}/${P}-fix-single-threaded.patch")
+PATCHES=(
+	"${FILESDIR}/${P}-fix-single-threaded.patch"
+	"${FILESDIR}/${P}-fix-riscv.patch"
+)
 
 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="
+DEPEND="
 	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
+"
+
+RDEPEND="${DEPEND}
+	!dev-lang/zig-bin
 "
-DEPEND="${RDEPEND}"
 
 llvm_check_deps() {
 	has_version "sys-devel/clang:${LLVM_SLOT}"
@@ -58,7 +56,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DZIG_USE_CCACHE=OFF
 		-DZIG_PREFER_CLANG_CPP_DYLIB=ON
-		-DZIG_SINGLE_THREADED="$(usex threads OFF ON)"
+		-DZIG_SINGLE_THREADED="$(usex !threads)"
 	)
 
 	cmake_src_configure
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index c081a14b93c0..32a064ec02fc 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -23,14 +23,18 @@ RESTRICT="!test? ( test )"
 
 BUILD_DIR="${S}/build"
 
-RDEPEND="
+DEPEND="
 	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}
 	>=sys-libs/zlib-1.2.12
 "
-DEPEND="${RDEPEND}"
+
+RDEPEND="
+	${DEPEND}
+	!dev-lang/zig-bin
+"
 
 llvm_check_deps() {
 	has_version "sys-devel/clang:${LLVM_SLOT}"
@@ -50,8 +54,8 @@ pkg_setup() {
 src_configure() {
 	local mycmakeargs=(
 		-DZIG_USE_CCACHE=OFF
-		-DZIG_PREFER_CLANG_CPP_DYLIB=ON
-		-DZIG_SINGLE_THREADED="$(usex threads OFF ON)"
+		-DZIG_SHARED_LLVM=ON
+		-DZIG_SINGLE_THREADED="$(usex !threads)"
 	)
 
 	cmake_src_configure
@@ -62,7 +66,7 @@ src_compile() {
 
 	if use stage2 ; then
 		cd "${BUILD_DIR}" || die
-		./zig build -p stage2 -Dstatic-llvm=false -Denable-llvm=true -Dsingle-threaded="$(usex threads false true)" || die
+		./zig build -p stage2 -Dstatic-llvm=false -Denable-llvm=true -Dsingle-threaded="$(usex threads false true)" -Dskip-install-lib-files=true --verbose || die
 	fi
 }
 
@@ -74,15 +78,11 @@ src_test() {
 src_install() {
 	cmake_src_install
 
-	if use stage2 ; then
-		cd "${BUILD_DIR}" || die
-		mv ./stage2/bin/zig zig-stage2 || die
-		dobin zig-stage2
-	fi
+	use stage2 && newbin "${BUILD_DIR}/stage2/bin/zig" zig-stage2
 }
 
 # see https://github.com/ziglang/zig/issues/3382
-QA_FLAGS_IGNORED="/usr/bin/zig-stage2"
+QA_FLAGS_IGNORED="usr/bin/zig-stage2"
 
 pkg_postinst() {
 	use stage2 && elog "You enabled stage2 USE flag, Zig stage1 was installed as /usr/bin/zig, Zig stage2 was installed as /usr/bin/zig-stage2"