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: Sat, 03 Jul 2021 15:46:24
Message-Id: 1625326814.ae36192c403d573af8ccf00c28b3d13009fb9661.juippis@gentoo
1 commit: ae36192c403d573af8ccf00c28b3d13009fb9661
2 Author: Aisha Tammy <floss <AT> bsd <DOT> ac>
3 AuthorDate: Tue Jun 22 19:33:17 2021 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 3 15:40:14 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae36192c
7
8 dev-lang/zig: version bump to 0.8.0
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
12 Closes: https://github.com/gentoo/gentoo/pull/21175
13 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
14
15 dev-lang/zig/Manifest | 1 +
16 dev-lang/zig/{zig-9999.ebuild => zig-0.8.0.ebuild} | 16 ++++++++++++----
17 dev-lang/zig/zig-9999.ebuild | 16 ++++++++++++----
18 3 files changed, 25 insertions(+), 8 deletions(-)
19
20 diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
21 index 54f58f160a2..877fd7c31c1 100644
22 --- a/dev-lang/zig/Manifest
23 +++ b/dev-lang/zig/Manifest
24 @@ -1 +1,2 @@
25 DIST zig-0.7.1.tar.gz 16082917 BLAKE2B 401bb079f2d0e2ad26837940e3b79c14237a492bd0b4df616f91b8b454ebd4ac3de36b2c988369c9eaaf7c2df4f95d4b1bb97760629f813ac8c7220e9542e12b SHA512 ad0b36f7b40481aca03940adfd42d34a724922993fc29a23a80412dc087ca6ce4876a400dc9bb7da455564521a88ea205c218988759ff6c56251a08232bfa41a
26 +DIST zig-0.8.0.tar.gz 19596459 BLAKE2B 7b688fdd201ce7b0b1e12127c4b1bf898699de18f410021e09bb056a56666aa8de512688a0048d6ac0ea8d6b7dfdb86e1a5416d2fab0a4911e16269d7b6be2a4 SHA512 2082810d5ab0560167766e80f0853e5ff99e32b1935836a6a0029b8e1c88061c55dd0c285cbcc506f4c38aac8477ec7162b771537699be9b3d387de94e3baa57
27
28 diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-0.8.0.ebuild
29 similarity index 85%
30 copy from dev-lang/zig/zig-9999.ebuild
31 copy to dev-lang/zig/zig-0.8.0.ebuild
32 index 063604d4ceb..b33c67c5132 100644
33 --- a/dev-lang/zig/zig-9999.ebuild
34 +++ b/dev-lang/zig/zig-0.8.0.ebuild
35 @@ -9,7 +9,8 @@ DESCRIPTION="A robust, optimal, and maintainable programming language"
36 HOMEPAGE="https://ziglang.org/"
37 LICENSE="MIT"
38 SLOT="0"
39 -IUSE="+experimental"
40 +IUSE="+experimental test"
41 +RESTRICT="!test? ( test )"
42
43 if [[ ${PV} == 9999 ]]; then
44 EGIT_REPO_URI="https://github.com/ziglang/zig.git"
45 @@ -19,6 +20,8 @@ else
46 KEYWORDS="~amd64"
47 fi
48
49 +BUILD_DIR="${S}/build"
50 +
51 # According to zig's author, zig builds that do not support all targets are not
52 # supported by the upstream project.
53 ALL_LLVM_TARGETS=(
54 @@ -28,12 +31,12 @@ ALL_LLVM_TARGETS=(
55 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
56 LLVM_TARGET_USEDEPS="${ALL_LLVM_TARGETS[@]}"
57
58 -LLVM_MAX_SLOT=11
59 +LLVM_MAX_SLOT=12
60
61 RDEPEND="
62 sys-devel/clang:${LLVM_MAX_SLOT}
63 - >=sys-devel/lld-11.0.0
64 - <sys-devel/lld-12.0.0
65 + >=sys-devel/lld-12.0.0
66 + <sys-devel/lld-13.0.0
67 sys-devel/llvm:${LLVM_MAX_SLOT}
68 !experimental? ( sys-devel/llvm:${LLVM_MAX_SLOT}[${LLVM_TARGET_USEDEPS// /,}] )
69 "
70 @@ -50,3 +53,8 @@ src_configure() {
71 )
72 cmake_src_configure
73 }
74 +
75 +src_test() {
76 + cd "${BUILD_DIR}"
77 + ./zig build test || die
78 +}
79
80 diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
81 index 063604d4ceb..b33c67c5132 100644
82 --- a/dev-lang/zig/zig-9999.ebuild
83 +++ b/dev-lang/zig/zig-9999.ebuild
84 @@ -9,7 +9,8 @@ DESCRIPTION="A robust, optimal, and maintainable programming language"
85 HOMEPAGE="https://ziglang.org/"
86 LICENSE="MIT"
87 SLOT="0"
88 -IUSE="+experimental"
89 +IUSE="+experimental test"
90 +RESTRICT="!test? ( test )"
91
92 if [[ ${PV} == 9999 ]]; then
93 EGIT_REPO_URI="https://github.com/ziglang/zig.git"
94 @@ -19,6 +20,8 @@ else
95 KEYWORDS="~amd64"
96 fi
97
98 +BUILD_DIR="${S}/build"
99 +
100 # According to zig's author, zig builds that do not support all targets are not
101 # supported by the upstream project.
102 ALL_LLVM_TARGETS=(
103 @@ -28,12 +31,12 @@ ALL_LLVM_TARGETS=(
104 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
105 LLVM_TARGET_USEDEPS="${ALL_LLVM_TARGETS[@]}"
106
107 -LLVM_MAX_SLOT=11
108 +LLVM_MAX_SLOT=12
109
110 RDEPEND="
111 sys-devel/clang:${LLVM_MAX_SLOT}
112 - >=sys-devel/lld-11.0.0
113 - <sys-devel/lld-12.0.0
114 + >=sys-devel/lld-12.0.0
115 + <sys-devel/lld-13.0.0
116 sys-devel/llvm:${LLVM_MAX_SLOT}
117 !experimental? ( sys-devel/llvm:${LLVM_MAX_SLOT}[${LLVM_TARGET_USEDEPS// /,}] )
118 "
119 @@ -50,3 +53,8 @@ src_configure() {
120 )
121 cmake_src_configure
122 }
123 +
124 +src_test() {
125 + cd "${BUILD_DIR}"
126 + ./zig build test || die
127 +}