Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/adblock/
Date: Fri, 14 Jan 2022 09:58:57
Message-Id: 1642154279.f10824a259721addcde8ae65d21d7b2ac72b8603.ionen@gentoo
1 commit: f10824a259721addcde8ae65d21d7b2ac72b8603
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 14 09:44:46 2022 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 14 09:57:59 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f10824a2
7
8 dev-python/adblock: pass --skip-auditwheel to maturin
9
10 Without it maturin attempts to look at linked libraries and bundle
11 them within the wheel (using patchelf to find them), and on musl it
12 thinks it should bundle libgcc_s.so. This is also in a scenerio
13 where we don't install using this wheel.
14
15 May prevent future issues on glibc as well, so unconditionally pass.
16 Option is valid for stable ~maturin-0.11.5 as well, albeit it doesn't
17 do this nor use patchelf and wasn't necessary.
18
19 Closes: https://bugs.gentoo.org/831171
20 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
21
22 dev-python/adblock/adblock-0.5.1.ebuild | 4 ++--
23 1 file changed, 2 insertions(+), 2 deletions(-)
24
25 diff --git a/dev-python/adblock/adblock-0.5.1.ebuild b/dev-python/adblock/adblock-0.5.1.ebuild
26 index ed820b8a8806..bbe06f214840 100644
27 --- a/dev-python/adblock/adblock-0.5.1.ebuild
28 +++ b/dev-python/adblock/adblock-0.5.1.ebuild
29 @@ -1,4 +1,4 @@
30 -# Copyright 2021 Gentoo Authors
31 +# Copyright 2022 Gentoo Authors
32 # Distributed under the terms of the GNU General Public License v2
33
34 EAPI=8
35 @@ -95,7 +95,7 @@ BDEPEND="
36 QA_FLAGS_IGNORED=".*/site-packages/${PN}/${PN}.abi3.so"
37
38 src_compile() {
39 - maturin build $(usev !debug --release) --no-sdist || die
40 + maturin build $(usev !debug --release) --no-sdist --skip-auditwheel || die
41
42 mv target/$(usex debug{,} release)/lib${PN}.so ${PN}/${PN}.abi3.so || die
43 }