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 D3B5A138359 for ; Thu, 19 Nov 2020 16:10:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 88EEBE07A7; Thu, 19 Nov 2020 16:10:56 +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 61C34E07A5 for ; Thu, 19 Nov 2020 16:10:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 DFD40335C78 for ; Thu, 19 Nov 2020 16:10:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2DA1744F for ; Thu, 19 Nov 2020 16:10:53 +0000 (UTC) From: "Guilherme Amadio" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Guilherme Amadio" Message-ID: <1605802148.dbdd161a2caa8e6c45aee32bfa4454d614b61b9b.amadio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/perf/perf-5.9.9.ebuild X-VCS-Directories: dev-util/perf/ X-VCS-Committer: amadio X-VCS-Committer-Name: Guilherme Amadio X-VCS-Revision: dbdd161a2caa8e6c45aee32bfa4454d614b61b9b X-VCS-Branch: master Date: Thu, 19 Nov 2020 16:10:53 +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: b8f2a8b8-7b7d-480a-9dd3-47afa6c5e95b X-Archives-Hash: 815e620e9aa0138ef993ca70cd355b15 commit: dbdd161a2caa8e6c45aee32bfa4454d614b61b9b Author: Guilherme Amadio gentoo org> AuthorDate: Thu Nov 19 16:09:08 2020 +0000 Commit: Guilherme Amadio gentoo org> CommitDate: Thu Nov 19 16:09:08 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbdd161a dev-util/perf: fixup previous commit Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Guilherme Amadio gentoo.org> dev-util/perf/perf-5.9.9.ebuild | 80 +++++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 38 deletions(-) diff --git a/dev-util/perf/perf-5.9.9.ebuild b/dev-util/perf/perf-5.9.9.ebuild index a0feac7cb31..4ab143e4afe 100644 --- a/dev-util/perf/perf-5.9.9.ebuild +++ b/dev-util/perf/perf-5.9.9.ebuild @@ -36,6 +36,16 @@ IUSE="audit clang crypt debug +demangle +doc gtk java libpfm lzma numa perl pyth # TODO babeltrace REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +BDEPEND=" + sys-devel/bison + sys-devel/flex + doc? ( + app-text/asciidoc + app-text/sgml-common + app-text/xmlto + sys-process/time + )" + RDEPEND="audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( @@ -55,18 +65,12 @@ RDEPEND="audit? ( sys-process/audit ) unwind? ( sys-libs/libunwind ) zlib? ( sys-libs/zlib ) dev-libs/elfutils" + DEPEND="${RDEPEND} >=sys-kernel/linux-headers-4.19 ${LINUX_PATCH+dev-util/patchutils} - sys-devel/bison - sys-devel/flex java? ( virtual/jdk ) - doc? ( - app-text/asciidoc - app-text/sgml-common - app-text/xmlto - sys-process/time - )" +" S_K="${WORKDIR}/linux-${LINUX_VER}" S="${S_K}/tools/perf" @@ -114,6 +118,36 @@ src_unpack() { done } +src_prepare() { + default + if [[ -n ${LINUX_PATCH} ]] ; then + pushd "${S_K}" >/dev/null || die + eapply "${WORKDIR}"/${P}.patch + popd || die + fi + + # Drop some upstream too-developer-oriented flags and fix the + # Makefile in general + sed -i \ + -e "s:\$(sysconfdir_SQ)/bash_completion.d:$(get_bashcompdir):" \ + "${S}"/Makefile.perf || die + # A few places still use -Werror w/out $(WERROR) protection. + sed -i -e 's:-Werror::' \ + "${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die + + # Avoid the call to make kernelversion + sed -i -e '/PERF-VERSION-GEN/d' Makefile.perf || die + echo "#define PERF_VERSION \"${PV}\"" > PERF-VERSION-FILE + + # The code likes to compile local assembly files which lack ELF markings. + find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} + + + # Fix shebang to use python from prefix + if [[ -n "${EPREFIX}" ]]; then + hprefixify ${S_K}/scripts/bpf_helpers_doc.py + fi +} + puse() { usex $1 "" no; } perf_make() { # The arch parsing is a bit funky. The perf tools package is integrated @@ -167,36 +201,6 @@ perf_make() { "$@" } -src_prepare() { - default - if [[ -n ${LINUX_PATCH} ]] ; then - pushd "${S_K}" >/dev/null || die - eapply "${WORKDIR}"/${P}.patch - popd || die - fi - - # Drop some upstream too-developer-oriented flags and fix the - # Makefile in general - sed -i \ - -e "s:\$(sysconfdir_SQ)/bash_completion.d:$(get_bashcompdir):" \ - "${S}"/Makefile.perf || die - # A few places still use -Werror w/out $(WERROR) protection. - sed -i -e 's:-Werror::' \ - "${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die - - # Avoid the call to make kernelversion - sed -i -e '/PERF-VERSION-GEN/d' Makefile.perf || die - echo "#define PERF_VERSION \"5.9.9\"" > PERF-VERSION-FILE - - # The code likes to compile local assembly files which lack ELF markings. - find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} + - - # Fix shebang to use python from prefix - if [[ -n "${EPREFIX}" ]]; then - hprefixify ${S_K}/scripts/bpf_helpers_doc.py - fi -} - src_compile() { # test-clang.bin not build with g++ if use clang; then