Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
Date: Sat, 25 Dec 2021 10:20:52
Message-Id: 1640427637.a8d16bb82ffe4a7369ed05479eb593c7f99452e9.sam@gentoo
1 commit: a8d16bb82ffe4a7369ed05479eb593c7f99452e9
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 25 10:20:13 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 25 10:20:37 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8d16bb8
7
8 dev-lang/zig: add 0.9.0
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 dev-lang/zig/Manifest | 1 +
13 dev-lang/zig/{zig-9999.ebuild => zig-0.9.0.ebuild} | 22 +++++++++++-----------
14 dev-lang/zig/zig-9999.ebuild | 22 +++++++++++-----------
15 3 files changed, 23 insertions(+), 22 deletions(-)
16
17 diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
18 index 77e8cc7d0e3d..ae56387e0a78 100644
19 --- a/dev-lang/zig/Manifest
20 +++ b/dev-lang/zig/Manifest
21 @@ -1,3 +1,4 @@
22 DIST zig-0.7.1.tar.gz 16082917 BLAKE2B 401bb079f2d0e2ad26837940e3b79c14237a492bd0b4df616f91b8b454ebd4ac3de36b2c988369c9eaaf7c2df4f95d4b1bb97760629f813ac8c7220e9542e12b SHA512 ad0b36f7b40481aca03940adfd42d34a724922993fc29a23a80412dc087ca6ce4876a400dc9bb7da455564521a88ea205c218988759ff6c56251a08232bfa41a
23 DIST zig-0.8.0.tar.gz 19596459 BLAKE2B 7b688fdd201ce7b0b1e12127c4b1bf898699de18f410021e09bb056a56666aa8de512688a0048d6ac0ea8d6b7dfdb86e1a5416d2fab0a4911e16269d7b6be2a4 SHA512 2082810d5ab0560167766e80f0853e5ff99e32b1935836a6a0029b8e1c88061c55dd0c285cbcc506f4c38aac8477ec7162b771537699be9b3d387de94e3baa57
24 DIST zig-0.8.1.tar.gz 19643170 BLAKE2B bc52f3399b3355a1fc7675329870dd107b21798fc562a9e55cd4a7c838cfdb2ed58ae3a01e3841a1a58c82fe27bec8758703b654b7548b9e431728aaabcd7ea6 SHA512 36bea566eee3dc5c00f2713cbc6616258dbadd3ee994749339f124f8b70c691cfe7fdce6a00194f879679ea417dadb3bcc244f8b79153957a426fea2d52caaf5
25 +DIST zig-0.9.0.tar.gz 21994175 BLAKE2B aadef89d5fddc3e802965125625e62140ac37bdac40b29ab8b7652056589c037cbed5d4e46889f335b3c296fb4ae2a7cafd5d064a02d728a8325ad515cdc8c7a SHA512 fef36221e818364b45cf65de210b0a9d535c411a510371a3ab4dfd6f4621c0a16dba786169f115a006966875102acc742abee19a74d83e2bc999ea5b8304b879
26
27 diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-0.9.0.ebuild
28 similarity index 86%
29 copy from dev-lang/zig/zig-9999.ebuild
30 copy to dev-lang/zig/zig-0.9.0.ebuild
31 index 6aa6d288a706..c49decab3bfc 100644
32 --- a/dev-lang/zig/zig-9999.ebuild
33 +++ b/dev-lang/zig/zig-0.9.0.ebuild
34 @@ -3,23 +3,24 @@
35
36 EAPI=7
37
38 +LLVM_MAX_SLOT=13
39 inherit cmake llvm
40
41 DESCRIPTION="A robust, optimal, and maintainable programming language"
42 HOMEPAGE="https://ziglang.org/"
43 -LICENSE="MIT"
44 -SLOT="0"
45 -IUSE="test"
46 -RESTRICT="!test? ( test )"
47 -
48 if [[ ${PV} == 9999 ]]; then
49 EGIT_REPO_URI="https://github.com/ziglang/zig.git"
50 inherit git-r3
51 else
52 - SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
53 - KEYWORDS="~amd64"
54 + SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
55 + KEYWORDS="~amd64 ~arm64"
56 fi
57
58 +LICENSE="MIT"
59 +SLOT="0"
60 +IUSE="test"
61 +RESTRICT="!test? ( test )"
62 +
63 BUILD_DIR="${S}/build"
64
65 # According to zig's author, zig builds that do not support all targets are not
66 @@ -31,12 +32,10 @@ ALL_LLVM_TARGETS=(
67 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
68 LLVM_TARGET_USEDEPS="${ALL_LLVM_TARGETS[@]}"
69
70 -LLVM_MAX_SLOT=13
71 -
72 RDEPEND="
73 sys-devel/clang:${LLVM_MAX_SLOT}
74 - >=sys-devel/lld-12.0.0
75 - <sys-devel/lld-14.0.0
76 + >=sys-devel/lld-${LLVM_MAX_SLOT}
77 + <sys-devel/lld-$((${LLVM_MAX_SLOT} + 1))
78 sys-devel/llvm:${LLVM_MAX_SLOT}[${LLVM_TARGET_USEDEPS// /,}]
79 "
80 DEPEND="${RDEPEND}"
81 @@ -50,6 +49,7 @@ src_configure() {
82 -DZIG_USE_CCACHE=OFF
83 -DZIG_PREFER_CLANG_CPP_DYLIB=ON
84 )
85 +
86 cmake_src_configure
87 }
88
89
90 diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
91 index 6aa6d288a706..c49decab3bfc 100644
92 --- a/dev-lang/zig/zig-9999.ebuild
93 +++ b/dev-lang/zig/zig-9999.ebuild
94 @@ -3,23 +3,24 @@
95
96 EAPI=7
97
98 +LLVM_MAX_SLOT=13
99 inherit cmake llvm
100
101 DESCRIPTION="A robust, optimal, and maintainable programming language"
102 HOMEPAGE="https://ziglang.org/"
103 -LICENSE="MIT"
104 -SLOT="0"
105 -IUSE="test"
106 -RESTRICT="!test? ( test )"
107 -
108 if [[ ${PV} == 9999 ]]; then
109 EGIT_REPO_URI="https://github.com/ziglang/zig.git"
110 inherit git-r3
111 else
112 - SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
113 - KEYWORDS="~amd64"
114 + SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
115 + KEYWORDS="~amd64 ~arm64"
116 fi
117
118 +LICENSE="MIT"
119 +SLOT="0"
120 +IUSE="test"
121 +RESTRICT="!test? ( test )"
122 +
123 BUILD_DIR="${S}/build"
124
125 # According to zig's author, zig builds that do not support all targets are not
126 @@ -31,12 +32,10 @@ ALL_LLVM_TARGETS=(
127 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
128 LLVM_TARGET_USEDEPS="${ALL_LLVM_TARGETS[@]}"
129
130 -LLVM_MAX_SLOT=13
131 -
132 RDEPEND="
133 sys-devel/clang:${LLVM_MAX_SLOT}
134 - >=sys-devel/lld-12.0.0
135 - <sys-devel/lld-14.0.0
136 + >=sys-devel/lld-${LLVM_MAX_SLOT}
137 + <sys-devel/lld-$((${LLVM_MAX_SLOT} + 1))
138 sys-devel/llvm:${LLVM_MAX_SLOT}[${LLVM_TARGET_USEDEPS// /,}]
139 "
140 DEPEND="${RDEPEND}"
141 @@ -50,6 +49,7 @@ src_configure() {
142 -DZIG_USE_CCACHE=OFF
143 -DZIG_PREFER_CLANG_CPP_DYLIB=ON
144 )
145 +
146 cmake_src_configure
147 }