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 6998E1382C5 for ; Wed, 6 Jan 2021 02:29:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7C964E07A5; Wed, 6 Jan 2021 02:29:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5FD96E07A5 for ; Wed, 6 Jan 2021 02:29:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D46F733BECB for ; Wed, 6 Jan 2021 02:29:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 50AF548D for ; Wed, 6 Jan 2021 02:29:23 +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: <1609900158.de258b4c9d6795ad94f67bb7afcd3bfdfc93b90d.chutzpah@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.18.0-r1.ebuild dev-util/bcc/bcc-0.18.0.ebuild X-VCS-Directories: dev-util/bcc/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: de258b4c9d6795ad94f67bb7afcd3bfdfc93b90d X-VCS-Branch: master Date: Wed, 6 Jan 2021 02:29:23 +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: 6d783f4d-c431-496a-aaca-13764193e318 X-Archives-Hash: ff12f32d71870fbd2b5d198fb07bbc69 commit: de258b4c9d6795ad94f67bb7afcd3bfdfc93b90d Author: Patrick McLean sony com> AuthorDate: Wed Jan 6 02:29:18 2021 +0000 Commit: Patrick McLean gentoo org> CommitDate: Wed Jan 6 02:29:18 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de258b4c dev-util/bcc-0.18.0-r1: revbump, re-add new lua eclass code Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Patrick McLean gentoo.org> dev-util/bcc/{bcc-0.18.0.ebuild => bcc-0.18.0-r1.ebuild} | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dev-util/bcc/bcc-0.18.0.ebuild b/dev-util/bcc/bcc-0.18.0-r1.ebuild similarity index 88% rename from dev-util/bcc/bcc-0.18.0.ebuild rename to dev-util/bcc/bcc-0.18.0-r1.ebuild index 34a22d563db..bb9b2a8339f 100644 --- a/dev-util/bcc/bcc-0.18.0.ebuild +++ b/dev-util/bcc/bcc-0.18.0-r1.ebuild @@ -3,9 +3,10 @@ EAPI=7 +LUA_COMPAT=( luajit ) PYTHON_COMPAT=( python3_{6..9} ) -inherit cmake linux-info llvm python-r1 +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/" @@ -15,8 +16,9 @@ SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="+luajit test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" +IUSE="+lua test" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + lua? ( ${LUA_REQUIRED_USE} )" RDEPEND=" >=dev-libs/libbpf-0.3[static-libs(-)] @@ -24,7 +26,7 @@ RDEPEND=" >=dev-libs/elfutils-0.166:= <=sys-devel/clang-12:= <=sys-devel/llvm-12:=[llvm_targets_BPF(+)] - luajit? ( dev-lang/luajit ) + lua? ( ${LUA_DEPS} ) ${PYTHON_DEPS} " DEPEND="${RDEPEND} @@ -87,8 +89,11 @@ src_configure() { -DCMAKE_USE_LIBBPF_PACKAGE=ON -DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}" -DPYTHON_CMD="${bcc_python_impls%;}" - $(usex luajit '-DWITH_LUAJIT=1') + ) + if use lua && use lua_single_target_luajit; then + mycmakeargs+=( -DWITH_LUAJIT=1 ) + fi cmake_src_configure }