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/
Date: Mon, 21 Feb 2022 02:49:50
Message-Id: 1645409606.9df6c67da670972816b47909d431bd263e57b708.sam@gentoo
1 commit: 9df6c67da670972816b47909d431bd263e57b708
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 21 02:13:26 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 21 02:13:26 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9df6c67d
7
8 sys-devel/mold: add 1.1
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 sys-devel/mold/Manifest | 1 +
13 sys-devel/mold/{mold-9999.ebuild => mold-1.1.ebuild} | 5 ++---
14 sys-devel/mold/mold-9999.ebuild | 5 ++---
15 3 files changed, 5 insertions(+), 6 deletions(-)
16
17 diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
18 index 0c5e13683969..585e6bd1feb1 100644
19 --- a/sys-devel/mold/Manifest
20 +++ b/sys-devel/mold/Manifest
21 @@ -1 +1,2 @@
22 DIST mold-1.0.3.tar.gz 4501162 BLAKE2B 68db6708ae05b3a4caf19bff8b381c9a7d045b7313e15ee9c0765042ef02898404527735a8f5379a2d213a7654f656cfe24eb20497d6d4f5e9ed666988050733 SHA512 50b4a80c8b7a4925e6e85a35e92529867648df61ca016ee662b3fce7cf9d4a8fd717311ec0542aa594f44b49d48de34d51d7e94cae0f21bda01fdd4418990f38
23 +DIST mold-1.1.tar.gz 4522886 BLAKE2B 6c63c171a6da090c3db391fa90e0095b2ab6f995e1d23be0dd93bb3057b3b9e5f5cf1deab5c80f6db3fa58bab69195a07a7e972373b9f1e633687cb8d4d45361 SHA512 b8b125c77563abe2741c2f32d73ab2b12dff275b92b633fcd015336c6ea735e38e95c3d2afb50e5baace2023d4f9de3eb50d53053eabc2cd2f045110eef4cc1e
24
25 diff --git a/sys-devel/mold/mold-9999.ebuild b/sys-devel/mold/mold-1.1.ebuild
26 similarity index 92%
27 copy from sys-devel/mold/mold-9999.ebuild
28 copy to sys-devel/mold/mold-1.1.ebuild
29 index 7948bbc23805..caa630e22c18 100644
30 --- a/sys-devel/mold/mold-9999.ebuild
31 +++ b/sys-devel/mold/mold-1.1.ebuild
32 @@ -23,12 +23,13 @@ SLOT="0"
33 RESTRICT="test"
34
35 RDEPEND=">=dev-cpp/tbb-2021.4.0:=
36 - dev-libs/xxhash:=
37 sys-libs/zlib
38 !kernel_Darwin? (
39 >=dev-libs/mimalloc-2:=
40 dev-libs/openssl:=
41 )"
42 +# As of 1.1, xxhash is now a header-only dep, but it's now bundled :(
43 +# TODO: restore SYSTEM_XXHASH upstream?
44 DEPEND="${RDEPEND}"
45
46 src_prepare() {
47 @@ -46,7 +47,6 @@ src_compile() {
48 CXXFLAGS="${CXXFLAGS}" \
49 SYSTEM_TBB=1 \
50 SYSTEM_MIMALLOC=1 \
51 - SYSTEM_XXHASH=1 \
52 STRIP="true" \
53 LIBDIR="${EPREFIX}/usr/$(get_libdir)"
54 }
55 @@ -62,7 +62,6 @@ src_install() {
56 emake \
57 SYSTEM_TBB=1 \
58 SYSTEM_MIMALLOC=1 \
59 - SYSTEM_XXHASH=1 \
60 DESTDIR="${D}" \
61 PREFIX="${EPREFIX}/usr" \
62 LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
63
64 diff --git a/sys-devel/mold/mold-9999.ebuild b/sys-devel/mold/mold-9999.ebuild
65 index 7948bbc23805..caa630e22c18 100644
66 --- a/sys-devel/mold/mold-9999.ebuild
67 +++ b/sys-devel/mold/mold-9999.ebuild
68 @@ -23,12 +23,13 @@ SLOT="0"
69 RESTRICT="test"
70
71 RDEPEND=">=dev-cpp/tbb-2021.4.0:=
72 - dev-libs/xxhash:=
73 sys-libs/zlib
74 !kernel_Darwin? (
75 >=dev-libs/mimalloc-2:=
76 dev-libs/openssl:=
77 )"
78 +# As of 1.1, xxhash is now a header-only dep, but it's now bundled :(
79 +# TODO: restore SYSTEM_XXHASH upstream?
80 DEPEND="${RDEPEND}"
81
82 src_prepare() {
83 @@ -46,7 +47,6 @@ src_compile() {
84 CXXFLAGS="${CXXFLAGS}" \
85 SYSTEM_TBB=1 \
86 SYSTEM_MIMALLOC=1 \
87 - SYSTEM_XXHASH=1 \
88 STRIP="true" \
89 LIBDIR="${EPREFIX}/usr/$(get_libdir)"
90 }
91 @@ -62,7 +62,6 @@ src_install() {
92 emake \
93 SYSTEM_TBB=1 \
94 SYSTEM_MIMALLOC=1 \
95 - SYSTEM_XXHASH=1 \
96 DESTDIR="${D}" \
97 PREFIX="${EPREFIX}/usr" \
98 LIBDIR="${EPREFIX}/usr/$(get_libdir)" \