commit: a5474661a2d448e8ae23309679fcd752d43519d8 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> AuthorDate: Sun Nov 7 20:58:07 2021 +0000 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> 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ć <jsmolic <AT> 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 }
