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 EB972158003 for ; Sun, 7 Nov 2021 20:59:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E0E9C2BC038; Sun, 7 Nov 2021 20:59:45 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id A07692BC002 for ; Sun, 7 Nov 2021 20:59:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 15C0F343208 for ; Sun, 7 Nov 2021 20:59:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5467B13F for ; Sun, 7 Nov 2021 20:59:42 +0000 (UTC) From: "Jakov Smolić" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jakov Smolić" Message-ID: <1636318715.a5474661a2d448e8ae23309679fcd752d43519d8.jsmolic@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/bcc/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/bcc/bcc-0.22.0-r1.ebuild X-VCS-Directories: dev-util/bcc/ X-VCS-Committer: jsmolic X-VCS-Committer-Name: Jakov Smolić X-VCS-Revision: a5474661a2d448e8ae23309679fcd752d43519d8 X-VCS-Branch: master Date: Sun, 7 Nov 2021 20:59:42 +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: 78226b81-6a25-408a-bb94-2db0535d8f59 X-Archives-Hash: ac09a170a710b5bc027cd813a2194e48 commit: a5474661a2d448e8ae23309679fcd752d43519d8 Author: Jakov Smolić gentoo org> AuthorDate: Sun Nov 7 20:58:07 2021 +0000 Commit: Jakov Smolić gentoo org> CommitDate: Sun Nov 7 20:58:35 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5474661 dev-util/bcc: Cleanup deps, bump max llvm version Havent't encountered any issues with llvm-13 so let's enable it in the package. Also cleanup libbpf deps, any version above 0.5.0 should be good (although currently there is no newer version than 0.5.0 released) Signed-off-by: Jakov Smolić gentoo.org> dev-util/bcc/bcc-0.22.0-r1.ebuild | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/dev-util/bcc/bcc-0.22.0-r1.ebuild b/dev-util/bcc/bcc-0.22.0-r1.ebuild index 36f7b33c57d..bca83ca19de 100644 --- a/dev-util/bcc/bcc-0.22.0-r1.ebuild +++ b/dev-util/bcc/bcc-0.22.0-r1.ebuild @@ -10,7 +10,6 @@ inherit cmake linux-info llvm lua-single python-r1 DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more" HOMEPAGE="https://iovisor.github.io/bcc/" - SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" @@ -19,19 +18,17 @@ KEYWORDS="~amd64 ~arm64 ~x86" IUSE="+lua test" REQUIRED_USE="${PYTHON_REQUIRED_USE} lua? ( ${LUA_REQUIRED_USE} )" +# tests need root access +RESTRICT="test" RDEPEND=" - || ( - ~dev-libs/libbpf-0.5.0 - ~dev-libs/libbpf-9999 - ) - dev-libs/libbpf:=[static-libs(-)] - >=sys-kernel/linux-headers-5.13 >=dev-libs/elfutils-0.166:= - <=sys-devel/clang-13:= - <=sys-devel/llvm-13:=[llvm_targets_BPF(+)] - lua? ( ${LUA_DEPS} ) + >=dev-libs/libbpf-0.5.0:=[static-libs(-)] + >=sys-kernel/linux-headers-5.13 + <=sys-devel/clang-14:= + <=sys-devel/llvm-14:=[llvm_targets_BPF(+)] ${PYTHON_DEPS} + lua? ( ${LUA_DEPS} ) " DEPEND="${RDEPEND} test? ( @@ -44,7 +41,6 @@ DEPEND="${RDEPEND} ) " BDEPEND=" - dev-util/cmake virtual/pkgconfig " @@ -53,9 +49,6 @@ PATCHES=( "${FILESDIR}/bcc-0.14.0-cmakelists.patch" ) -# tests need root access -RESTRICT="test" - pkg_pretend() { local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF ~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL @@ -65,7 +58,7 @@ pkg_pretend() { } pkg_setup() { - LLVM_MAX_SLOT=12 llvm_pkg_setup + LLVM_MAX_SLOT=13 llvm_pkg_setup python_setup }