Gentoo Archives: gentoo-commits

From: Guilherme Amadio <amadio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
Date: Fri, 30 Apr 2021 09:43:01
Message-Id: 1619775755.607ae226a678a567b344952fa2f5522a12773644.amadio@gentoo
1 commit: 607ae226a678a567b344952fa2f5522a12773644
2 Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 30 09:42:30 2021 +0000
4 Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 30 09:42:35 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=607ae226
7
8 dev-util/perf: add support for dev-util/babeltrace
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.3
11 Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
12
13 dev-util/perf/metadata.xml | 1 +
14 dev-util/perf/perf-5.12.ebuild | 6 +++---
15 2 files changed, 4 insertions(+), 3 deletions(-)
16
17 diff --git a/dev-util/perf/metadata.xml b/dev-util/perf/metadata.xml
18 index 279962a1a52..18c5fbdc755 100644
19 --- a/dev-util/perf/metadata.xml
20 +++ b/dev-util/perf/metadata.xml
21 @@ -13,6 +13,7 @@
22 <name>Guilherme Amadio</name>
23 </maintainer>
24 <use>
25 + <flag name="babeltrace">Enable <pkg>dev-util/babeltrace</pkg> support</flag>
26 <flag name="clang">Enable builtin clang and LLVM support</flag>
27 <flag name="demangle">
28 Enable C++ symbol name demangling, using libbfd from
29
30 diff --git a/dev-util/perf/perf-5.12.ebuild b/dev-util/perf/perf-5.12.ebuild
31 index ad940b16bba..9ca795b5dee 100644
32 --- a/dev-util/perf/perf-5.12.ebuild
33 +++ b/dev-util/perf/perf-5.12.ebuild
34 @@ -32,7 +32,7 @@ SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
35 LICENSE="GPL-2"
36 SLOT="0"
37 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
38 -IUSE="audit clang crypt debug +demangle +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib"
39 +IUSE="audit babeltrace clang crypt debug +demangle +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib"
40 # TODO babeltrace
41 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
42
43 @@ -51,6 +51,7 @@ BDEPEND="
44 "
45
46 RDEPEND="audit? ( sys-process/audit )
47 + babeltrace? ( dev-util/babeltrace )
48 crypt? ( dev-libs/openssl:0= )
49 clang? (
50 <sys-devel/clang-10:*
51 @@ -168,7 +169,6 @@ perf_make() {
52 local java_dir
53 use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
54 # FIXME: NO_CORESIGHT
55 - # FIXME: NO_LIBBABELTRACE
56 emake V=1 VF=1 \
57 HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \
58 CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" NM="$(tc-getNM)" \
59 @@ -188,7 +188,7 @@ perf_make() {
60 feature-gtk2-infobar=$(usex gtk 1 "") \
61 NO_JVMTI=$(puse java) \
62 NO_LIBAUDIT=$(puse audit) \
63 - NO_LIBBABELTRACE=1 \
64 + NO_LIBBABELTRACE=$(puse babeltrace) \
65 NO_LIBBIONIC=1 \
66 NO_LIBBPF= \
67 NO_LIBCRYPTO=$(puse crypt) \