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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 46523158011 for ; Tue, 21 Sep 2021 00:37:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3286AE0877; Tue, 21 Sep 2021 00:37:16 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6F7C5E087B for ; Tue, 21 Sep 2021 00:37:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3AB9F343065 for ; Tue, 21 Sep 2021 00:37:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 84542D0 for ; Tue, 21 Sep 2021 00:37:12 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <1632184627.5d22ff4feb4aef6552ba0f27521e01001b7a849d.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libbpf/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libbpf/libbpf-9999.ebuild X-VCS-Directories: dev-libs/libbpf/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: 5d22ff4feb4aef6552ba0f27521e01001b7a849d X-VCS-Branch: master Date: Tue, 21 Sep 2021 00:37:12 +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: 9a824f22-c582-4073-8e0f-88d64a956642 X-Archives-Hash: 0a3ddabb25fe3fcd7235dd1d5c89fa7d commit: 5d22ff4feb4aef6552ba0f27521e01001b7a849d Author: Jakov Smolić gentoo org> AuthorDate: Tue Sep 14 19:12:54 2021 +0000 Commit: Patrick McLean gentoo org> CommitDate: Tue Sep 21 00:37:07 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d22ff4f dev-libs/libbpf: Port to EAPI 8 - Reorder variables per skel.ebuild - Drop redundant COMMON_DEPEND - Export CC, AR and other variables instead of passing them directly to emake - Drop USE=static-libs, since the build-system doesn't offer a way to build only shared library, so let's just install both libraries unconditionally Signed-off-by: Jakov Smolić gentoo.org> Signed-off-by: Patrick McLean gentoo.org> dev-libs/libbpf/libbpf-9999.ebuild | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/dev-libs/libbpf/libbpf-9999.ebuild b/dev-libs/libbpf/libbpf-9999.ebuild index a122d56cb68..2b8fd07a6a9 100644 --- a/dev-libs/libbpf/libbpf-9999.ebuild +++ b/dev-libs/libbpf/libbpf-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 2019-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit flag-o-matic toolchain-funcs @@ -10,46 +10,42 @@ if [[ ${PV} =~ [9]{4,} ]]; then EGIT_REPO_URI="https://github.com/libbpf/libbpf.git" else SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi S="${WORKDIR}/${P}/src" -HOMEPAGE="https://github.com/libbpf/libbpf" DESCRIPTION="Stand-alone build of libbpf from the Linux kernel" +HOMEPAGE="https://github.com/libbpf/libbpf" LICENSE="GPL-2 LGPL-2.1 BSD-2" SLOT="0/${PV}" -IUSE="+static-libs" +IUSE="static-libs" -COMMON_DEPEND="virtual/libelf - !<=dev-util/bcc-0.7.0" -DEPEND="${COMMON_DEPEND} - sys-kernel/linux-headers" -RDEPEND="${COMMON_DEPEND}" +DEPEND=" + sys-kernel/linux-headers + virtual/libelf" +RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}/libbpf-9999-paths.patch" + "${FILESDIR}"/libbpf-9999-paths.patch ) -src_compile() { +src_configure() { append-cflags -fPIC - emake \ - BUILD_SHARED=y \ - LIBSUBDIR="$(get_libdir)" \ - $(usex static-libs 'BUILD_STATIC=y' '' '' '') \ - CC="$(tc-getCC)" \ - AR="$(tc-getAR)" \ - V=1 + tc-export CC AR + export LIBSUBDIR="$(get_libdir)" + export V=1 } src_install() { emake \ - BUILD_SHARED=y \ - LIBSUBDIR="$(get_libdir)" \ DESTDIR="${D}" \ - $(usex static-libs 'BUILD_STATIC=y' '' '' '') \ install install_uapi_headers + if ! use static-libs; then + find "${ED}" -name '*.a' -delete || die + fi + insinto /usr/$(get_libdir)/pkgconfig doins ${PN}.pc }