[gentoo-commits] repo/gentoo:master commit in: dev-util/perf/

[Guilherme Amadio]

commit:     607ae226a678a567b344952fa2f5522a12773644
Author:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 30 09:42:30 2021 +0000
Commit:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 09:42:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=607ae226

dev-util/perf: add support for dev-util/babeltrace

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>

 dev-util/perf/metadata.xml     | 1 +
 dev-util/perf/perf-5.12.ebuild | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev-util/perf/metadata.xml b/dev-util/perf/metadata.xml
index 279962a1a52..18c5fbdc755 100644
--- a/dev-util/perf/metadata.xml
+++ b/dev-util/perf/metadata.xml
@@ -13,6 +13,7 @@
     <name>Guilherme Amadio</name>
   </maintainer>
   <use>
+    <flag name="babeltrace">Enable <pkg>dev-util/babeltrace</pkg> 
support</flag>
     <flag name="clang">Enable builtin clang and LLVM support</flag>
     <flag name="demangle">
       Enable C++ symbol name demangling, using libbfd from

diff --git a/dev-util/perf/perf-5.12.ebuild b/dev-util/perf/perf-5.12.ebuild
index ad940b16bba..9ca795b5dee 100644
--- a/dev-util/perf/perf-5.12.ebuild
+++ b/dev-util/perf/perf-5.12.ebuild
@@ -32,7 +32,7 @@ SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}";
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit clang crypt debug +demangle +doc gtk java libpfm lzma numa perl 
python slang systemtap unwind zlib"
+IUSE="audit babeltrace clang crypt debug +demangle +doc gtk java libpfm lzma 
numa perl python slang systemtap unwind zlib"
 # TODO babeltrace
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -51,6 +51,7 @@ BDEPEND="
 "
 
 RDEPEND="audit? ( sys-process/audit )
+       babeltrace? ( dev-util/babeltrace )
        crypt? ( dev-libs/openssl:0= )
        clang? (
                <sys-devel/clang-10:*
@@ -168,7 +169,6 @@ perf_make() {
        local java_dir
        use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
        # FIXME: NO_CORESIGHT
-       # FIXME: NO_LIBBABELTRACE
        emake V=1 VF=1 \
                HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \
                CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" 
LD="$(tc-getLD)" NM="$(tc-getNM)" \
@@ -188,7 +188,7 @@ perf_make() {
                feature-gtk2-infobar=$(usex gtk 1 "") \
                NO_JVMTI=$(puse java) \
                NO_LIBAUDIT=$(puse audit) \
-               NO_LIBBABELTRACE=1 \
+               NO_LIBBABELTRACE=$(puse babeltrace) \
                NO_LIBBIONIC=1 \
                NO_LIBBPF= \
                NO_LIBCRYPTO=$(puse crypt) \