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-util/clippy/
Date: Tue, 17 May 2022 01:06:49
Message-Id: 1652749577.0e4bdd6bbebca017d6099c62090116306d1c1a89.sam@gentoo
1 commit: 0e4bdd6bbebca017d6099c62090116306d1c1a89
2 Author: orbea <orbea <AT> riseup <DOT> net>
3 AuthorDate: Sun May 15 01:05:34 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue May 17 01:06:17 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e4bdd6b
7
8 dev-util/clippy: Fix clippy install with slibtool
9
10 Installing a file created by libtool is not portable for slibtool and
11 this will result in installing the slibtool shell wrapper script for
12 clippy and not the clippy binary.
13
14 This additionally fails when compiling net-misc/frr which will use the
15 shell wrapper script that does not work outside of the build directory.
16
17 The 'make install' target is not appropriate for --enable-clippy-only
18 and fixing that seems like significant work so just use shell instead to
19 find the correct file.
20
21 I bumped the ebuild revision because this causes a build failure in frr.
22
23 Bug: https://bugs.gentoo.org/830087
24 Signed-off-by: orbea <orbea <AT> riseup.net>
25 Closes: https://github.com/gentoo/gentoo/pull/25491
26 Signed-off-by: Sam James <sam <AT> gentoo.org>
27
28 dev-util/clippy/clippy-8.2.2-r1.ebuild | 46 ++++++++++++++++++++++++++++++++++
29 1 file changed, 46 insertions(+)
30
31 diff --git a/dev-util/clippy/clippy-8.2.2-r1.ebuild b/dev-util/clippy/clippy-8.2.2-r1.ebuild
32 new file mode 100644
33 index 000000000000..5b4cdd92cece
34 --- /dev/null
35 +++ b/dev-util/clippy/clippy-8.2.2-r1.ebuild
36 @@ -0,0 +1,46 @@
37 +# Copyright 2020-2022 Gentoo Authors
38 +# Distributed under the terms of the GNU General Public License v2
39 +
40 +EAPI=8
41 +
42 +MY_P="frr-${PV}"
43 +PYTHON_COMPAT=( python3_{8..10} )
44 +inherit autotools python-single-r1
45 +
46 +DESCRIPTION="Standalone clippy tool built from FRR sources"
47 +HOMEPAGE="https://frrouting.org/"
48 +SRC_URI="https://github.com/FRRouting/frr/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
49 +S="${WORKDIR}/frr-${MY_P}"
50 +
51 +LICENSE="GPL-2"
52 +SLOT="0"
53 +KEYWORDS="~amd64 ~arm64 ~x86"
54 +REQUIRED_USE="${PYTHON_REQUIRED_USE}"
55 +
56 +# standalone clippy does not have any tests
57 +# restrict to prevent bug 811753
58 +RESTRICT="test"
59 +
60 +DEPEND="
61 + ${PYTHON_DEPS}
62 + virtual/libelf:=
63 +"
64 +RDEPEND="${DEPEND}"
65 +BDEPEND="sys-devel/flex"
66 +
67 +src_prepare() {
68 + default
69 + eautoreconf
70 +}
71 +
72 +src_configure() {
73 + econf --enable-clippy-only
74 +}
75 +
76 +src_install() {
77 + # 830087
78 + find "lib" -type f -name "clippy" -print0 |
79 + xargs -0 file | grep executable | grep ELF | cut -f 1 -d : |
80 + xargs -I '{}' dobin '{}' ||
81 + die "Failed to install 'lib/clippy'"
82 +}