From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 64830158090 for ; Tue, 17 May 2022 01:06:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 909DDE0833; Tue, 17 May 2022 01:06:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2931FE0833 for ; Tue, 17 May 2022 01:06:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BF007341390 for ; Tue, 17 May 2022 01:06:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 375FD46D for ; Tue, 17 May 2022 01:06:44 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1652749577.0e4bdd6bbebca017d6099c62090116306d1c1a89.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/clippy/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/clippy/clippy-8.2.2-r1.ebuild X-VCS-Directories: dev-util/clippy/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0e4bdd6bbebca017d6099c62090116306d1c1a89 X-VCS-Branch: master Date: Tue, 17 May 2022 01:06:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 41c50f82-94b4-418f-be8d-496d01fe970d X-Archives-Hash: 06b7748b52f255cde8cdb879babe9eef commit: 0e4bdd6bbebca017d6099c62090116306d1c1a89 Author: orbea riseup net> AuthorDate: Sun May 15 01:05:34 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue May 17 01:06:17 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e4bdd6b dev-util/clippy: Fix clippy install with slibtool Installing a file created by libtool is not portable for slibtool and this will result in installing the slibtool shell wrapper script for clippy and not the clippy binary. This additionally fails when compiling net-misc/frr which will use the shell wrapper script that does not work outside of the build directory. The 'make install' target is not appropriate for --enable-clippy-only and fixing that seems like significant work so just use shell instead to find the correct file. I bumped the ebuild revision because this causes a build failure in frr. Bug: https://bugs.gentoo.org/830087 Signed-off-by: orbea riseup.net> Closes: https://github.com/gentoo/gentoo/pull/25491 Signed-off-by: Sam James gentoo.org> dev-util/clippy/clippy-8.2.2-r1.ebuild | 46 ++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dev-util/clippy/clippy-8.2.2-r1.ebuild b/dev-util/clippy/clippy-8.2.2-r1.ebuild new file mode 100644 index 000000000000..5b4cdd92cece --- /dev/null +++ b/dev-util/clippy/clippy-8.2.2-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_P="frr-${PV}" +PYTHON_COMPAT=( python3_{8..10} ) +inherit autotools python-single-r1 + +DESCRIPTION="Standalone clippy tool built from FRR sources" +HOMEPAGE="https://frrouting.org/" +SRC_URI="https://github.com/FRRouting/frr/archive/${MY_P}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/frr-${MY_P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# standalone clippy does not have any tests +# restrict to prevent bug 811753 +RESTRICT="test" + +DEPEND=" + ${PYTHON_DEPS} + virtual/libelf:= +" +RDEPEND="${DEPEND}" +BDEPEND="sys-devel/flex" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf --enable-clippy-only +} + +src_install() { + # 830087 + find "lib" -type f -name "clippy" -print0 | + xargs -0 file | grep executable | grep ELF | cut -f 1 -d : | + xargs -I '{}' dobin '{}' || + die "Failed to install 'lib/clippy'" +}