Gentoo Archives: gentoo-commits

From:	Joonas Niilola <juippis@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
Date:	Tue, 29 Mar 2022 07:20:50
Message-Id:	`1648538439.716f9df176f41d165541932174bb10968a180f65.juippis@gentoo`

1	commit: 716f9df176f41d165541932174bb10968a180f65
2	Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
3	AuthorDate: Tue Mar 29 07:18:59 2022 +0000
4	Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5	CommitDate: Tue Mar 29 07:20:39 2022 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=716f9df1
7
8	dev-lang/zig: fix pkg_setup on 0.9.1
9
10	- two eclasses export pkg_setup causing a conflict.
11
12	Closes: https://bugs.gentoo.org/836310
13	Thanks-to: Ionen Wolkens <ionen <AT> gentoo.org>
14	Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
15
16	dev-lang/zig/zig-0.9.1.ebuild \| 5 +++++
17	1 file changed, 5 insertions(+)
18
19	diff --git a/dev-lang/zig/zig-0.9.1.ebuild b/dev-lang/zig/zig-0.9.1.ebuild
20	index 30aa4b234c28..1ce53e760265 100644
21	--- a/dev-lang/zig/zig-0.9.1.ebuild
22	+++ b/dev-lang/zig/zig-0.9.1.ebuild
23	@@ -47,6 +47,11 @@ llvm_check_deps() {
24	# see https://github.com/ziglang/zig/wiki/Troubleshooting-Build-Issues#high-memory-requirements
25	CHECKREQS_MEMORY="10G"
26
27	+pkg_setup() {
28	+ llvm_pkg_setup
29	+ check-reqs_pkg_setup
30	+}
31	+
32	src_configure() {
33	local mycmakeargs=(
34	-DZIG_USE_CCACHE=OFF