Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/, sys-devel/mold/files/
Date: Thu, 10 Feb 2022 07:50:27
Message-Id: 1644479412.a254bacec24ef5bdeb2e350fa77cab786cbe20b1.sam@gentoo
1 commit: a254bacec24ef5bdeb2e350fa77cab786cbe20b1
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 10 07:12:57 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 10 07:50:12 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a254bace
7
8 sys-devel/mold: drop 1.0.0-r1, 1.0.1-r1, 1.0.2
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 sys-devel/mold/Manifest | 3 -
13 .../mold/files/mold-1.0.1-no-gold-in-version.patch | 50 ---------------
14 sys-devel/mold/mold-1.0.0-r1.ebuild | 67 --------------------
15 sys-devel/mold/mold-1.0.1-r1.ebuild | 71 ----------------------
16 sys-devel/mold/mold-1.0.2.ebuild | 71 ----------------------
17 5 files changed, 262 deletions(-)
18
19 diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
20 index 148258091bca..0c5e13683969 100644
21 --- a/sys-devel/mold/Manifest
22 +++ b/sys-devel/mold/Manifest
23 @@ -1,4 +1 @@
24 -DIST mold-1.0.0.tar.gz 3482927 BLAKE2B 56ebc267370548a2f91a71ebeed87871cede6f564c29dc7d44a499b95fe570f6e9c8a717baf2d9e235c7057c41e735b315493bd23d3b44574d2a44b14aaf5ef8 SHA512 99ffd0b9e2ff7157cc8b26808675c9d3147bf88961155ae19ed9b99990ac647b7ec31ee78d05062decc6d41e66d99aa0fdc398d119803929b8dbff51eb3d077c
25 -DIST mold-1.0.1.tar.gz 3675262 BLAKE2B 0e40860d3c0a221d368c94b9f58c20b245ee61de6f9eb6d1454ed3b6f103933c79ddd7358049e2aacf497221232d952c2117ba2b3371cbe37fb8ad4ae42461c2 SHA512 cc03a7db395362b97879c28942397d4443d12b72e067b6f979b1ece4d8aab06154b4c1a0f4c57d6ac505bcd4f892bf9a355ad281d628d4d544d8f70edaf34b72
26 -DIST mold-1.0.2.tar.gz 4501088 BLAKE2B 51bac4bd44a785893c04dd03ccef6119b41a036789938a354545e7a22f16852b52079b3a3e4d27db860748e13966be18bbe813bf04b15c496f35d16ecca4b22c SHA512 27f6664e63c76c32a6e3ec8bfc4b204138926001f5431be94da9ce47a5d9d3b51aa634c5cd6df45be660d52ac0507f7b7eec17134e35db402db5747d2ecc3715
27 DIST mold-1.0.3.tar.gz 4501162 BLAKE2B 68db6708ae05b3a4caf19bff8b381c9a7d045b7313e15ee9c0765042ef02898404527735a8f5379a2d213a7654f656cfe24eb20497d6d4f5e9ed666988050733 SHA512 50b4a80c8b7a4925e6e85a35e92529867648df61ca016ee662b3fce7cf9d4a8fd717311ec0542aa594f44b49d48de34d51d7e94cae0f21bda01fdd4418990f38
28
29 diff --git a/sys-devel/mold/files/mold-1.0.1-no-gold-in-version.patch b/sys-devel/mold/files/mold-1.0.1-no-gold-in-version.patch
30 deleted file mode 100644
31 index 429e55cc51a9..000000000000
32 --- a/sys-devel/mold/files/mold-1.0.1-no-gold-in-version.patch
33 +++ /dev/null
34 @@ -1,50 +0,0 @@
35 -From cea6a569afa544826c91fda7ef0f9941f50c9459 Mon Sep 17 00:00:00 2001
36 -From: Rui Ueyama <ruiu@×××××××××××.edu>
37 -Date: Wed, 12 Jan 2022 16:31:04 +0900
38 -Subject: [PATCH] [ELF] Remove "GNU gold" from the --version string
39 -
40 -That substring was introduced in de7ba9014f9d9d70b9173c4bfac6c3433186ba49
41 -to appease Gentoo's dev-libs/jansson-2.13.1-r1 package. But I think I
42 -shouldn't done that from the beginning to avoid the sitaution of the
43 -"User-Agent" string of the web browser, which everybody claims they
44 -are Mozilla, AppleWebKit, Chrome and Safari simultaneously.
45 ----
46 - main.cc | 4 ++--
47 - test/elf/version.sh | 6 +++---
48 - 2 files changed, 5 insertions(+), 5 deletions(-)
49 -
50 -diff --git a/main.cc b/main.cc
51 -index 38a41cdf..8831f7f2 100644
52 ---- a/main.cc
53 -+++ b/main.cc
54 -@@ -26,10 +26,10 @@ std::string_view errno_string() {
55 -
56 - #ifdef GIT_HASH
57 - const std::string mold_version =
58 -- "mold " MOLD_VERSION " (" GIT_HASH "; compatible with GNU ld and GNU gold)";
59 -+ "mold " MOLD_VERSION " (" GIT_HASH "; compatible with GNU ld)";
60 - #else
61 - const std::string mold_version =
62 -- "mold " MOLD_VERSION " (compatible with GNU ld and GNU gold)";
63 -+ "mold " MOLD_VERSION " (compatible with GNU ld)";
64 - #endif
65 -
66 - void cleanup() {
67 -diff --git a/test/elf/version.sh b/test/elf/version.sh
68 -index ae52b504..4ca576ef 100755
69 ---- a/test/elf/version.sh
70 -+++ b/test/elf/version.sh
71 -@@ -10,10 +10,10 @@ mold="$(pwd)/mold"
72 - t=out/test/elf/$testname
73 - mkdir -p $t
74 -
75 --"$mold" -v | grep -q 'mold .*compatible with GNU ld and GNU gold'
76 --"$mold" --version | grep -q 'mold .*compatible with GNU ld and GNU gold'
77 -+"$mold" -v | grep -q 'mold .*compatible with GNU ld'
78 -+"$mold" --version | grep -q 'mold .*compatible with GNU ld'
79 -
80 --"$mold" -V | grep -q 'mold .*compatible with GNU ld and GNU gold'
81 -+"$mold" -V | grep -q 'mold .*compatible with GNU ld'
82 - "$mold" -V | grep -q elf_x86_64
83 - "$mold" -V | grep -q elf_i386
84 -
85
86 diff --git a/sys-devel/mold/mold-1.0.0-r1.ebuild b/sys-devel/mold/mold-1.0.0-r1.ebuild
87 deleted file mode 100644
88 index 8560f5f36a1e..000000000000
89 --- a/sys-devel/mold/mold-1.0.0-r1.ebuild
90 +++ /dev/null
91 @@ -1,67 +0,0 @@
92 -# Copyright 2021-2022 Gentoo Authors
93 -# Distributed under the terms of the GNU General Public License v2
94 -
95 -EAPI=8
96 -
97 -inherit toolchain-funcs
98 -
99 -DESCRIPTION="A Modern Linker"
100 -HOMEPAGE="https://github.com/rui314/mold"
101 -if [[ ${PV} == 9999 ]] ; then
102 - EGIT_REPO_URI="https://github.com/rui314/mold.git"
103 - inherit git-r3
104 -else
105 - SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
106 - KEYWORDS="~amd64"
107 -fi
108 -
109 -LICENSE="AGPL-3"
110 -SLOT="0"
111 -
112 -# Try again after 1.0 (nearly there, but path-related issues)
113 -# https://github.com/rui314/mold/issues/137
114 -RESTRICT="test"
115 -
116 -RDEPEND=">=dev-cpp/tbb-2021.4.0:=
117 - dev-libs/xxhash:=
118 - sys-libs/zlib
119 - !kernel_Darwin? (
120 - <dev-libs/mimalloc-2:=
121 - dev-libs/openssl:=
122 - )"
123 -DEPEND="${RDEPEND}"
124 -
125 -src_prepare() {
126 - default
127 -
128 - # Needs unpackaged dwarfdump
129 - rm test/elf/{compress-debug-sections.sh,compressed-debug-info.sh} || die
130 -}
131 -
132 -src_compile() {
133 - tc-export CC CXX
134 -
135 - emake \
136 - SYSTEM_TBB=1 \
137 - SYSTEM_MIMALLOC=1 \
138 - STRIP="true" \
139 - LIBDIR="${EPREFIX}/usr/$(get_libdir)"
140 -}
141 -
142 -src_test() {
143 - emake \
144 - SYSTEM_TBB=1 \
145 - SYSTEM_MIMALLOC=1 \
146 - check
147 -}
148 -
149 -src_install() {
150 - emake \
151 - SYSTEM_TBB=1 \
152 - SYSTEM_MIMALLOC=1 \
153 - DESTDIR="${D}" \
154 - PREFIX="${EPREFIX}/usr" \
155 - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
156 - STRIP="true" \
157 - install
158 -}
159
160 diff --git a/sys-devel/mold/mold-1.0.1-r1.ebuild b/sys-devel/mold/mold-1.0.1-r1.ebuild
161 deleted file mode 100644
162 index 55ecbef5a00e..000000000000
163 --- a/sys-devel/mold/mold-1.0.1-r1.ebuild
164 +++ /dev/null
165 @@ -1,71 +0,0 @@
166 -# Copyright 2021-2022 Gentoo Authors
167 -# Distributed under the terms of the GNU General Public License v2
168 -
169 -EAPI=8
170 -
171 -inherit toolchain-funcs
172 -
173 -DESCRIPTION="A Modern Linker"
174 -HOMEPAGE="https://github.com/rui314/mold"
175 -if [[ ${PV} == 9999 ]] ; then
176 - EGIT_REPO_URI="https://github.com/rui314/mold.git"
177 - inherit git-r3
178 -else
179 - SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
180 - KEYWORDS="~amd64"
181 -fi
182 -
183 -LICENSE="AGPL-3"
184 -SLOT="0"
185 -
186 -# Try again after 1.0 (nearly there, but path-related issues)
187 -# https://github.com/rui314/mold/issues/137
188 -RESTRICT="test"
189 -
190 -RDEPEND=">=dev-cpp/tbb-2021.4.0:=
191 - dev-libs/xxhash:=
192 - sys-libs/zlib
193 - !kernel_Darwin? (
194 - >=dev-libs/mimalloc-2:=
195 - dev-libs/openssl:=
196 - )"
197 -DEPEND="${RDEPEND}"
198 -
199 -PATCHES=( "${FILESDIR}/${P}-no-gold-in-version.patch" )
200 -
201 -src_prepare() {
202 - default
203 -
204 - # Needs unpackaged dwarfdump
205 - rm test/elf/{compress-debug-sections,compressed-debug-info}.sh || die
206 -}
207 -
208 -src_compile() {
209 - tc-export CC CXX
210 -
211 - emake \
212 - SYSTEM_TBB=1 \
213 - SYSTEM_MIMALLOC=1 \
214 - SYSTEM_XXHASH=1 \
215 - STRIP="true" \
216 - LIBDIR="${EPREFIX}/usr/$(get_libdir)"
217 -}
218 -
219 -src_test() {
220 - emake \
221 - SYSTEM_TBB=1 \
222 - SYSTEM_MIMALLOC=1 \
223 - check
224 -}
225 -
226 -src_install() {
227 - emake \
228 - SYSTEM_TBB=1 \
229 - SYSTEM_MIMALLOC=1 \
230 - SYSTEM_XXHASH=1 \
231 - DESTDIR="${D}" \
232 - PREFIX="${EPREFIX}/usr" \
233 - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
234 - STRIP="true" \
235 - install
236 -}
237
238 diff --git a/sys-devel/mold/mold-1.0.2.ebuild b/sys-devel/mold/mold-1.0.2.ebuild
239 deleted file mode 100644
240 index 7948bbc23805..000000000000
241 --- a/sys-devel/mold/mold-1.0.2.ebuild
242 +++ /dev/null
243 @@ -1,71 +0,0 @@
244 -# Copyright 2021-2022 Gentoo Authors
245 -# Distributed under the terms of the GNU General Public License v2
246 -
247 -EAPI=8
248 -
249 -inherit toolchain-funcs
250 -
251 -DESCRIPTION="A Modern Linker"
252 -HOMEPAGE="https://github.com/rui314/mold"
253 -if [[ ${PV} == 9999 ]] ; then
254 - EGIT_REPO_URI="https://github.com/rui314/mold.git"
255 - inherit git-r3
256 -else
257 - SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
258 - KEYWORDS="~amd64"
259 -fi
260 -
261 -LICENSE="AGPL-3"
262 -SLOT="0"
263 -
264 -# Try again after 1.0 (nearly there, but path-related issues)
265 -# https://github.com/rui314/mold/issues/137
266 -RESTRICT="test"
267 -
268 -RDEPEND=">=dev-cpp/tbb-2021.4.0:=
269 - dev-libs/xxhash:=
270 - sys-libs/zlib
271 - !kernel_Darwin? (
272 - >=dev-libs/mimalloc-2:=
273 - dev-libs/openssl:=
274 - )"
275 -DEPEND="${RDEPEND}"
276 -
277 -src_prepare() {
278 - default
279 -
280 - # Needs unpackaged dwarfdump
281 - rm test/elf/{compress-debug-sections,compressed-debug-info}.sh || die
282 -}
283 -
284 -src_compile() {
285 - tc-export CC CXX
286 -
287 - emake \
288 - CFLAGS="${CFLAGS}" \
289 - CXXFLAGS="${CXXFLAGS}" \
290 - SYSTEM_TBB=1 \
291 - SYSTEM_MIMALLOC=1 \
292 - SYSTEM_XXHASH=1 \
293 - STRIP="true" \
294 - LIBDIR="${EPREFIX}/usr/$(get_libdir)"
295 -}
296 -
297 -src_test() {
298 - emake \
299 - SYSTEM_TBB=1 \
300 - SYSTEM_MIMALLOC=1 \
301 - check
302 -}
303 -
304 -src_install() {
305 - emake \
306 - SYSTEM_TBB=1 \
307 - SYSTEM_MIMALLOC=1 \
308 - SYSTEM_XXHASH=1 \
309 - DESTDIR="${D}" \
310 - PREFIX="${EPREFIX}/usr" \
311 - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
312 - STRIP="true" \
313 - install
314 -}