* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2015-08-14 15:23 Naohiro Aota
0 siblings, 0 replies; 141+ messages in thread
From: Naohiro Aota @ 2015-08-14 15:23 UTC (permalink / raw
To: gentoo-commits
commit: ddeb5413afe3ee50eae2c42e56091f08c25d1467
Author: Naohiro Aota <naota <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 14 15:16:24 2015 +0000
Commit: Naohiro Aota <naota <AT> gentoo <DOT> org>
CommitDate: Fri Aug 14 15:23:28 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddeb5413
dev-util/perf: version bump to 4.1.5 (bug 544990)
Gentoo-Bug: 544990
Package-Manager: portage-2.2.20
dev-util/perf/Manifest | 2 +
dev-util/perf/metadata.xml | 1 +
dev-util/perf/perf-4.1.5.ebuild | 189 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 192 insertions(+)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 1b4f956..14b853b 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -2,5 +2,7 @@ DIST linux-3.12.tar.bz2 91111381 SHA256 43129defd9079c99cf5e57506d36b6b01614c734
DIST linux-3.13.tar.xz 77187032 SHA256 4d5e5eee5f276424c32e9591f1b6c971baedc7b49f28ce03d1f48b1e5d6226a2 SHA512 1ba223bb4b885d691a67196d86a8aaf7b4a1c351bf2a762f50f1b0c32da00dd0c28895872a66b49e8d244498d996876609268e64861d28ac4048886ef9f79b87 WHIRLPOOL 2992257a17e85b3eb16fcaf21678fa6dbf31f80c2099fd1ad0ff9852ac1d16122ac8e2c0b46421d8895d4368253a724e439cd625307ee7af7bd1e50cb2c9b62a
DIST linux-3.15.tar.xz 79676484 SHA256 c3927e87be4040fa8aca1b58663dc0776aaf00485604ff88a623be2f3fb07794 SHA512 d5dc477cad4584e56e2e2ef9e0950c2b22e76e5cf5090a896ba099cb7c5e5db1853a4aeb96b199189653dc66d461557e95198e37516a619f7ddc01ba6b308e02 WHIRLPOOL 7f3dfde1a23aab75b7f40770ae2ca77c1b28f845e4abe6296b2aec9b56fe94f7afa76b00eb6cc7475305c31b726ebeb4643107dd48c12ac04c933cf1856b8e77
DIST linux-3.8.tar.bz2 84623657 SHA256 fce774b5313e73949cb35f128e91e7b2ccd7fa2438abc5cff69267e504395a45 SHA512 966a3b08aecc4b135a48ea73ba3326e1710c455e6da29693479e9d1a56663fc10f569e2342fa861486d39d4ea5c2af406d1bd40613c15555acffdba160ef7ba9 WHIRLPOOL a83baa904c78f71fed5e4cf2607b8e6d1db70a4137b5c00b3cc5f60f04042724faa3cfec36a781417d483548ba0c811f559e82146806edacd1c2fe90bd398e64
+DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8
DIST patch-3.13.1.xz 2884 SHA256 74a093b2cacddac0a105e0989b7bf0e9829b9923e2d71ca10382e90324a17e74 SHA512 164235a15e6a984e9aeaf9fe475a8b2975d5e4c4b28dd4ecf99064b0f0c72eea766d925340f1a7232cabcbd23d26773527c300b6d995bf5cde18a276208fdccc WHIRLPOOL 0ea0118960970b7d6465445252e7a21a6aeb494c0afefec5f52a68c0b7e0d63fd2ed59a3877fbe9ebd282ac03812235b021534866efa8f46d549b6f70228e4b6
DIST patch-3.15.5.xz 122232 SHA256 9b0d000e0bdec7a25ee6303afdab8d2af77439995876eadd6ce248e5c954037d SHA512 6831200503334e839c3cccdad29058aecc0205171cc5b75205d0a2aada8636633889ebff35d9677d4567bbaeea249efc83571e016104cd67554fe72b3b405755 WHIRLPOOL 56e1e817c08b4557e18b34d148d8ffd0f73bf8dec92f2339ca9413ca2143b65ec35f6d48c87e37f140226e57d7df33f06d6c53a48dafa7ddf090a839fdabe024
+DIST patch-4.1.5.xz 170056 SHA256 b495cf8a7b978986dd2b757b687751c62f635d15cc2228edb80934bc0d449dcc SHA512 1325cdb35ea1f277d513932af37804f788b96ae63b94cedeb3c9b916ee8963bbd6aca5d0e13279e36a81f1de06005c5f3666ecfc845609932686f261fa4250c5 WHIRLPOOL 291ddfcde395c3d201a8172f7281ac560167a8bce78d3196b47e4c7be759545282cc1104fc7b2edc95d90250a834cc23103199275bc8c6974bd4229dd530d1a3
diff --git a/dev-util/perf/metadata.xml b/dev-util/perf/metadata.xml
index b4aba51..7f295e9 100644
--- a/dev-util/perf/metadata.xml
+++ b/dev-util/perf/metadata.xml
@@ -21,6 +21,7 @@
documentation handling tools that are not always welcome on user
systems.
</flag>
+ <flag name="numa">Enable NUMA support</flag>
<flag name="perl">
Add support for Perl as a scripting language for perf tools.
</flag>
diff --git a/dev-util/perf/perf-4.1.5.ebuild b/dev-util/perf/perf-4.1.5.ebuild
new file mode 100644
index 0000000..b49b73f
--- /dev/null
+++ b/dev-util/perf/perf-4.1.5.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+inherit versionator eutils toolchain-funcs python-single-r1 linux-info
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="http://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+ LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
+ PATCH_VERSION=$(get_version_component_range 1-3)
+ LINUX_PATCH=patch-${PV//_/-}.xz
+ SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+ mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+else
+ VER_COUNT=$(get_version_component_count)
+ if [[ ${VER_COUNT} -gt 2 ]] ; then
+ # stable-release series
+ LINUX_VER=$(get_version_component_range 1-2)
+ LINUX_PATCH=patch-${PV}.xz
+ SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+ else
+ LINUX_VER=${PV}
+ SRC_URI=""
+ fi
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="audit debug +demangle +doc gtk numa perl python slang unwind"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="audit? ( sys-process/audit )
+ demangle? ( sys-devel/binutils:= )
+ gtk? ( x11-libs/gtk+:2 )
+ numa? ( sys-process/numactl )
+ perl? ( dev-lang/perl )
+ slang? ( dev-libs/newt )
+ unwind? ( sys-libs/libunwind )
+ dev-libs/elfutils"
+DEPEND="${RDEPEND}
+ ${LINUX_PATCH+dev-util/patchutils}
+ sys-devel/bison
+ sys-devel/flex
+ doc? (
+ app-text/asciidoc
+ app-text/sgml-common
+ app-text/xmlto
+ sys-process/time
+ )
+ python? ( ${PYTHON_DEPS} )"
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
+CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+
+pkg_setup() {
+ linux-info_pkg_setup
+ use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+ local paths=(
+ tools/build tools/include tools/lib tools/perf tools/scripts
+ include lib "arch/*/include" "arch/*/lib"
+ )
+
+ # We expect the tar implementation to support the -j option (both
+ # GNU tar and libarchive's tar support that).
+ echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+ tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+ "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ eshopts_push -o noglob
+ ebegin "Filtering partial source patch"
+ filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+ > ${P}.patch || die
+ eend $? || die "filterdiff failed"
+ eshopts_pop
+ fi
+
+ local a
+ for a in ${A}; do
+ [[ ${a} == ${LINUX_SOURCES} ]] && continue
+ [[ ${a} == ${LINUX_PATCH} ]] && continue
+ unpack ${a}
+ done
+}
+
+src_prepare() {
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ cd "${S_K}"
+ epatch "${WORKDIR}"/${P}.patch
+ fi
+
+ # Drop some upstream too-developer-oriented flags and fix the
+ # Makefile in general
+ sed -i \
+ -e 's:-Werror::' \
+ -e 's:-ggdb3::' \
+ -e 's:-fstack-protector-all::' \
+ -e 's:^LDFLAGS =:EXTLIBS +=:' \
+ -e '/\(PERL\|PYTHON\)_EMBED_LDOPTS/s:ALL_LDFLAGS +=:EXTLIBS +=:' \
+ -e '/-x c - /s:\$(ALL_LDFLAGS):\0 $(EXTLIBS):' \
+ -e '/^ALL_CFLAGS =/s:$: $(CFLAGS_OPTIMIZE):' \
+ -e '/^ALL_LDFLAGS =/s:$: $(LDFLAGS_OPTIMIZE):' \
+ -e 's:$(sysconfdir_SQ)/bash_completion.d:/usr/share/bash-completion:' \
+ "${S}"/Makefile || die
+ sed -i -e 's:-Werror::' "${S_K}"/tools/lib/api/Makefile || die
+ sed -i \
+ -e '/.FORCE-PERF-VERSION-FILE/s,.FORCE-PERF-VERSION-FILE,,g' \
+ "${S}"/Makefile \
+ "${S}"/Documentation/Makefile || die
+
+ # Avoid the call to make kernelversion
+ echo "#define PERF_VERSION \"${MY_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' {} +
+}
+
+puse() { usex $1 "" no; }
+perf_make() {
+ # The arch parsing is a bit funky. The perf tools package is integrated
+ # into the kernel, so it wants an ARCH that looks like the kernel arch,
+ # but it also wants to know about the split value -- i386/x86_64 vs just
+ # x86. We can get that by telling the func to use an older linux version.
+ # It's kind of a hack, but not that bad ...
+ # prefix="/usr" bindir_relative="bin" \
+ local arch=$(tc-arch-kernel)
+ emake V=1 \
+ CC="$(tc-getCC)" AR="$(tc-getAR)" \
+ CFLAGS_OPTIMIZE="${CFLAGS}" \
+ LDFLAGS_OPTIMIZE="${LDFLAGS}" \
+ ARCH="${arch}" \
+ NO_DEMANGLE=$(puse demangle) \
+ NO_GTK2=$(puse gtk) \
+ NO_LIBAUDIT=$(puse audit) \
+ NO_LIBPERL=$(puse perl) \
+ NO_LIBPYTHON=$(puse python) \
+ NO_LIBUNWIND=$(puse unwind) \
+ NO_NEWT=$(puse slang) \
+ NO_LIBNUMA=$(puse numa) \
+ WERROR=0 \
+ "$@"
+}
+
+src_compile() {
+ perf_make -f Makefile.perf
+ use doc && perf_make -C Documentation
+}
+
+src_test() {
+ :
+}
+
+src_install() {
+ perf_make -f Makefile.perf install DESTDIR="${D}"
+
+ dodoc CREDITS
+
+ dodoc *txt Documentation/*.txt
+ if use doc ; then
+ dohtml Documentation/*.html
+ doman Documentation/*.1
+ fi
+}
+
+pkg_postinst() {
+ if ! use doc ; then
+ elog "Without the doc USE flag you won't get any documentation nor man pages."
+ elog "And without man pages, you won't get any --help output for perf and its"
+ elog "sub-tools."
+ fi
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2016-03-08 13:10 Naohiro Aota
0 siblings, 0 replies; 141+ messages in thread
From: Naohiro Aota @ 2016-03-08 13:10 UTC (permalink / raw
To: gentoo-commits
commit: bcbb2f4be62e7026e728494e0321312743e99176
Author: Naohiro Aota <naota <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 8 13:08:50 2016 +0000
Commit: Naohiro Aota <naota <AT> gentoo <DOT> org>
CommitDate: Tue Mar 8 13:10:27 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcbb2f4b
dev-util/perf: version bump #559786
Package-Manager: portage-2.2.27
dev-util/perf/Manifest | 2 +
dev-util/perf/perf-4.4.4.ebuild | 185 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 187 insertions(+)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 14b853b..e756632 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -3,6 +3,8 @@ DIST linux-3.13.tar.xz 77187032 SHA256 4d5e5eee5f276424c32e9591f1b6c971baedc7b49
DIST linux-3.15.tar.xz 79676484 SHA256 c3927e87be4040fa8aca1b58663dc0776aaf00485604ff88a623be2f3fb07794 SHA512 d5dc477cad4584e56e2e2ef9e0950c2b22e76e5cf5090a896ba099cb7c5e5db1853a4aeb96b199189653dc66d461557e95198e37516a619f7ddc01ba6b308e02 WHIRLPOOL 7f3dfde1a23aab75b7f40770ae2ca77c1b28f845e4abe6296b2aec9b56fe94f7afa76b00eb6cc7475305c31b726ebeb4643107dd48c12ac04c933cf1856b8e77
DIST linux-3.8.tar.bz2 84623657 SHA256 fce774b5313e73949cb35f128e91e7b2ccd7fa2438abc5cff69267e504395a45 SHA512 966a3b08aecc4b135a48ea73ba3326e1710c455e6da29693479e9d1a56663fc10f569e2342fa861486d39d4ea5c2af406d1bd40613c15555acffdba160ef7ba9 WHIRLPOOL a83baa904c78f71fed5e4cf2607b8e6d1db70a4137b5c00b3cc5f60f04042724faa3cfec36a781417d483548ba0c811f559e82146806edacd1c2fe90bd398e64
DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8
+DIST linux-4.4.tar.xz 87295988 SHA256 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e WHIRLPOOL 02abc203d867404b9934aaa4c1e5b5dcbb0b0021e91a03f3a7e7fd224eed106821d8b4949f32a590536db150e5a88c16fcde88538777a26d0c17900f0257b1bc
DIST patch-3.13.1.xz 2884 SHA256 74a093b2cacddac0a105e0989b7bf0e9829b9923e2d71ca10382e90324a17e74 SHA512 164235a15e6a984e9aeaf9fe475a8b2975d5e4c4b28dd4ecf99064b0f0c72eea766d925340f1a7232cabcbd23d26773527c300b6d995bf5cde18a276208fdccc WHIRLPOOL 0ea0118960970b7d6465445252e7a21a6aeb494c0afefec5f52a68c0b7e0d63fd2ed59a3877fbe9ebd282ac03812235b021534866efa8f46d549b6f70228e4b6
DIST patch-3.15.5.xz 122232 SHA256 9b0d000e0bdec7a25ee6303afdab8d2af77439995876eadd6ce248e5c954037d SHA512 6831200503334e839c3cccdad29058aecc0205171cc5b75205d0a2aada8636633889ebff35d9677d4567bbaeea249efc83571e016104cd67554fe72b3b405755 WHIRLPOOL 56e1e817c08b4557e18b34d148d8ffd0f73bf8dec92f2339ca9413ca2143b65ec35f6d48c87e37f140226e57d7df33f06d6c53a48dafa7ddf090a839fdabe024
DIST patch-4.1.5.xz 170056 SHA256 b495cf8a7b978986dd2b757b687751c62f635d15cc2228edb80934bc0d449dcc SHA512 1325cdb35ea1f277d513932af37804f788b96ae63b94cedeb3c9b916ee8963bbd6aca5d0e13279e36a81f1de06005c5f3666ecfc845609932686f261fa4250c5 WHIRLPOOL 291ddfcde395c3d201a8172f7281ac560167a8bce78d3196b47e4c7be759545282cc1104fc7b2edc95d90250a834cc23103199275bc8c6974bd4229dd530d1a3
+DIST patch-4.4.4.xz 200972 SHA256 9061d8f57cc25d760387c4e6b7d5cceacaa808e8784a3e478012e7c2949853c8 SHA512 c206af7803cb0915fbe2bd27ed33282452db3fbd3070c73e4c7147443efd3c7588fb3be12d0abc08742381fbe892190602b29147684630aa9e6ff5e9efa49dbc WHIRLPOOL e6a004e32eecca1507354f97d3de85a07c1b9512fe3d4d87173e6d39c02ef1c2411abd0c26b6a077cd5eaefde11dd201445f72b9a0cf185e76635bdcc36df8dd
diff --git a/dev-util/perf/perf-4.4.4.ebuild b/dev-util/perf/perf-4.4.4.ebuild
new file mode 100644
index 0000000..18dd89e
--- /dev/null
+++ b/dev-util/perf/perf-4.4.4.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+inherit versionator eutils toolchain-funcs python-single-r1 linux-info
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+ LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
+ PATCH_VERSION=$(get_version_component_range 1-3)
+ LINUX_PATCH=patch-${PV//_/-}.xz
+ SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+ mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+else
+ VER_COUNT=$(get_version_component_count)
+ if [[ ${VER_COUNT} -gt 2 ]] ; then
+ # stable-release series
+ LINUX_VER=$(get_version_component_range 1-2)
+ LINUX_PATCH=patch-${PV}.xz
+ SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+ else
+ LINUX_VER=${PV}
+ SRC_URI=""
+ fi
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="audit debug +demangle +doc gtk numa perl python slang unwind"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="audit? ( sys-process/audit )
+ demangle? ( sys-devel/binutils:= )
+ gtk? ( x11-libs/gtk+:2 )
+ numa? ( sys-process/numactl )
+ perl? ( dev-lang/perl )
+ slang? ( dev-libs/newt )
+ unwind? ( sys-libs/libunwind )
+ dev-libs/elfutils"
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-4.4
+ ${LINUX_PATCH+dev-util/patchutils}
+ sys-devel/bison
+ sys-devel/flex
+ doc? (
+ app-text/asciidoc
+ app-text/sgml-common
+ app-text/xmlto
+ sys-process/time
+ )
+ python? ( ${PYTHON_DEPS} )"
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
+CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+
+pkg_setup() {
+ linux-info_pkg_setup
+ use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+ local paths=(
+ tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
+ include lib "arch/*/lib"
+ )
+
+ # We expect the tar implementation to support the -j option (both
+ # GNU tar and libarchive's tar support that).
+ echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+ tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+ "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ eshopts_push -o noglob
+ ebegin "Filtering partial source patch"
+ filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+ > ${P}.patch || die
+ eend $? || die "filterdiff failed"
+ eshopts_pop
+ fi
+
+ local a
+ for a in ${A}; do
+ [[ ${a} == ${LINUX_SOURCES} ]] && continue
+ [[ ${a} == ${LINUX_PATCH} ]] && continue
+ unpack ${a}
+ done
+}
+
+src_prepare() {
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ cd "${S_K}"
+ epatch "${WORKDIR}"/${P}.patch
+ fi
+
+ # Drop some upstream too-developer-oriented flags and fix the
+ # Makefile in general
+ sed -i \
+ -e 's:-Werror::' \
+ -e 's:-ggdb3::' \
+ -e 's:-fstack-protector-all::' \
+ -e 's:^LDFLAGS =:EXTLIBS +=:' \
+ -e '/\(PERL\|PYTHON\)_EMBED_LDOPTS/s:ALL_LDFLAGS +=:EXTLIBS +=:' \
+ -e '/-x c - /s:\$(ALL_LDFLAGS):\0 $(EXTLIBS):' \
+ "${S}"/config/Makefile || die
+ sed -i \
+ -e 's:$(sysconfdir_SQ)/bash_completion.d:/usr/share/bash-completion:' \
+ "${S}"/Makefile.perf || die
+ sed -i -e 's:-Werror::' "${S_K}"/tools/lib/api/Makefile || die
+
+ # Avoid the call to make kernelversion
+ echo "#define PERF_VERSION \"${MY_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' {} +
+}
+
+puse() { usex $1 "" no; }
+perf_make() {
+ # The arch parsing is a bit funky. The perf tools package is integrated
+ # into the kernel, so it wants an ARCH that looks like the kernel arch,
+ # but it also wants to know about the split value -- i386/x86_64 vs just
+ # x86. We can get that by telling the func to use an older linux version.
+ # It's kind of a hack, but not that bad ...
+ local arch=$(tc-arch-kernel)
+ emake V=1 \
+ CC="$(tc-getCC)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
+ prefix="/usr" bindir_relative="bin" \
+ EXTRA_CFLAGS="${CFLAGS}" \
+ ARCH="${arch}" \
+ NO_DEMANGLE=$(puse demangle) \
+ NO_GTK2=$(puse gtk) \
+ NO_LIBAUDIT=$(puse audit) \
+ NO_LIBPERL=$(puse perl) \
+ NO_LIBPYTHON=$(puse python) \
+ NO_LIBUNWIND=$(puse unwind) \
+ NO_NEWT=$(puse slang) \
+ NO_LIBNUMA=$(puse numa) \
+ WERROR=0 \
+ "$@"
+}
+
+src_compile() {
+ perf_make -f Makefile.perf
+ use doc && perf_make -C Documentation
+}
+
+src_test() {
+ :
+}
+
+src_install() {
+ perf_make -f Makefile.perf install DESTDIR="${D}"
+
+ dodoc CREDITS
+
+ dodoc *txt Documentation/*.txt
+ if use doc ; then
+ dohtml Documentation/*.html
+ doman Documentation/*.1
+ fi
+}
+
+pkg_postinst() {
+ if ! use doc ; then
+ elog "Without the doc USE flag you won't get any documentation nor man pages."
+ elog "And without man pages, you won't get any --help output for perf and its"
+ elog "sub-tools."
+ fi
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2016-11-09 14:04 Pacho Ramos
0 siblings, 0 replies; 141+ messages in thread
From: Pacho Ramos @ 2016-11-09 14:04 UTC (permalink / raw
To: gentoo-commits
commit: 0a12e8a9367dbc4e3fd85e7d5b917fde3864a870
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 9 14:01:48 2016 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Nov 9 14:04:31 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a12e8a9
dev-util/perf: Drop old
Package-Manager: portage-2.3.2
dev-util/perf/Manifest | 1 -
dev-util/perf/perf-3.8-r1.ebuild | 170 ---------------------------------------
2 files changed, 171 deletions(-)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index e756632..f2797b1 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,7 +1,6 @@
DIST linux-3.12.tar.bz2 91111381 SHA256 43129defd9079c99cf5e57506d36b6b01614c734a5ed9e604d3a7c1510ab8b22 SHA512 bea14d044c8a0257d8312f45db6a39ca4f9dffe8ac32a11198e90762ee1735c8b6975bb81c635a4755d451793fa7c7e5b2d7d692c9e57133b15b4cdc941febf1 WHIRLPOOL 1889c3f689cf305856112f350e3901175b9f6c4f1e4143d62b40e502000685ade3e75b211a8a9fd948f6225e1c57a68cae10ceb649ff7976981089290d562926
DIST linux-3.13.tar.xz 77187032 SHA256 4d5e5eee5f276424c32e9591f1b6c971baedc7b49f28ce03d1f48b1e5d6226a2 SHA512 1ba223bb4b885d691a67196d86a8aaf7b4a1c351bf2a762f50f1b0c32da00dd0c28895872a66b49e8d244498d996876609268e64861d28ac4048886ef9f79b87 WHIRLPOOL 2992257a17e85b3eb16fcaf21678fa6dbf31f80c2099fd1ad0ff9852ac1d16122ac8e2c0b46421d8895d4368253a724e439cd625307ee7af7bd1e50cb2c9b62a
DIST linux-3.15.tar.xz 79676484 SHA256 c3927e87be4040fa8aca1b58663dc0776aaf00485604ff88a623be2f3fb07794 SHA512 d5dc477cad4584e56e2e2ef9e0950c2b22e76e5cf5090a896ba099cb7c5e5db1853a4aeb96b199189653dc66d461557e95198e37516a619f7ddc01ba6b308e02 WHIRLPOOL 7f3dfde1a23aab75b7f40770ae2ca77c1b28f845e4abe6296b2aec9b56fe94f7afa76b00eb6cc7475305c31b726ebeb4643107dd48c12ac04c933cf1856b8e77
-DIST linux-3.8.tar.bz2 84623657 SHA256 fce774b5313e73949cb35f128e91e7b2ccd7fa2438abc5cff69267e504395a45 SHA512 966a3b08aecc4b135a48ea73ba3326e1710c455e6da29693479e9d1a56663fc10f569e2342fa861486d39d4ea5c2af406d1bd40613c15555acffdba160ef7ba9 WHIRLPOOL a83baa904c78f71fed5e4cf2607b8e6d1db70a4137b5c00b3cc5f60f04042724faa3cfec36a781417d483548ba0c811f559e82146806edacd1c2fe90bd398e64
DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8
DIST linux-4.4.tar.xz 87295988 SHA256 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e WHIRLPOOL 02abc203d867404b9934aaa4c1e5b5dcbb0b0021e91a03f3a7e7fd224eed106821d8b4949f32a590536db150e5a88c16fcde88538777a26d0c17900f0257b1bc
DIST patch-3.13.1.xz 2884 SHA256 74a093b2cacddac0a105e0989b7bf0e9829b9923e2d71ca10382e90324a17e74 SHA512 164235a15e6a984e9aeaf9fe475a8b2975d5e4c4b28dd4ecf99064b0f0c72eea766d925340f1a7232cabcbd23d26773527c300b6d995bf5cde18a276208fdccc WHIRLPOOL 0ea0118960970b7d6465445252e7a21a6aeb494c0afefec5f52a68c0b7e0d63fd2ed59a3877fbe9ebd282ac03812235b021534866efa8f46d549b6f70228e4b6
diff --git a/dev-util/perf/perf-3.8-r1.ebuild b/dev-util/perf/perf-3.8-r1.ebuild
deleted file mode 100644
index 1f72038..00000000
--- a/dev-util/perf/perf-3.8-r1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-PYTHON_DEPEND="python? 2"
-inherit versionator eutils toolchain-funcs python linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV/_rc} != ${PV} ]] ; then
- LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
- PATCH_VERSION=$(get_version_component_range 1-3)
- LINUX_PATCH=patch-${PV//_/-}.bz2
- SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
- mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ $(get_version_component_count) == 4 ]] ; then
- # stable-release series
- LINUX_VER=$(get_version_component_range 1-3)
- LINUX_PATCH=patch-${PV}.bz2
- SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
- LINUX_VER=${PV}
- SRC_URI=""
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.bz2"
-SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
-IUSE="audit +demangle +doc perl python slang unwind"
-
-RDEPEND="audit? ( sys-process/audit )
- demangle? ( sys-devel/binutils )
- perl? ( dev-lang/perl )
- slang? ( dev-libs/newt )
- unwind? ( sys-libs/libunwind )
- dev-libs/elfutils"
-DEPEND="${RDEPEND}
- ${LINUX_PATCH+dev-util/patchutils}
- sys-devel/bison
- sys-devel/flex
- 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"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-pkg_setup() {
- linux-info_pkg_setup
- use python && python_set_active_version 2
-}
-
-src_unpack() {
- local paths=( tools/perf tools/scripts tools/lib include lib "arch/*/include" "arch/*/lib" )
-
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} > ${P}.patch || die
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- done
-}
-
-src_prepare() {
- if [[ -n ${LINUX_PATCH} ]] ; then
- cd "${S_K}"
- epatch "${WORKDIR}"/${P}.patch
- fi
-
- # Drop some upstream too-developer-oriented flags and fix the
- # Makefile in general
- sed -i \
- -e 's:-Werror::' \
- -e 's:-ggdb3::' \
- -e 's:-fstack-protector-all::' \
- -e 's:^LDFLAGS =:EXTLIBS +=:' \
- -e '/\(PERL\|PYTHON\)_EMBED_LDOPTS/s:ALL_LDFLAGS +=:EXTLIBS +=:' \
- -e '/-x c - /s:\$(ALL_LDFLAGS):\0 $(EXTLIBS):' \
- -e '/^ALL_CFLAGS =/s:$: $(CFLAGS_OPTIMIZE):' \
- -e '/^ALL_LDFLAGS =/s:$: $(LDFLAGS_OPTIMIZE):' \
- -e 's:$(sysconfdir_SQ)/bash_completion.d:/usr/share/bash-completion:' \
- "${S}"/Makefile
- sed -i \
- -e '/.FORCE-PERF-VERSION-FILE/s,.FORCE-PERF-VERSION-FILE,,g' \
- "${S}"/Makefile \
- "${S}"/Documentation/Makefile
-
- # Avoid the call to make kernelversion
- echo "PERF_VERSION = ${MY_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' {} +
-}
-
-puse() { usex $1 "" no; }
-perf_make() {
- local arch=$(tc-arch)
- [[ "${arch}" == "amd64" ]] && arch="x86_64"
- emake -j1 V=1 \
- CC="$(tc-getCC)" AR="$(tc-getAR)" \
- prefix="/usr" bindir_relative="sbin" \
- CFLAGS_OPTIMIZE="${CFLAGS}" \
- LDFLAGS_OPTIMIZE="${LDFLAGS}" \
- ARCH="${arch}" \
- NO_DEMANGLE=$(puse demangle) \
- NO_LIBAUDIT=$(puse audit) \
- NO_LIBPERL=$(puse perl) \
- NO_LIBPYTHON=$(puse python) \
- NO_LIBUNWIND=$(puse unwind) \
- NO_NEWT=$(puse slang) \
- "$@"
-}
-
-src_compile() {
- perf_make
- use doc && perf_make -C Documentation
-}
-
-src_test() {
- :
-}
-
-src_install() {
- perf_make install DESTDIR="${D}"
-
- dodoc CREDITS
-
- dodoc *txt Documentation/*.txt
- if use doc ; then
- dohtml Documentation/*.html
- doman Documentation/*.1
- fi
-}
-
-pkg_postinst() {
- if ! use doc ; then
- elog "Without the doc USE flag you won't get any documentation nor man pages."
- elog "And without man pages, you won't get any --help output for perf and its"
- elog "sub-tools."
- fi
-}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2017-02-28 6:35 Yixun Lan
0 siblings, 0 replies; 141+ messages in thread
From: Yixun Lan @ 2017-02-28 6:35 UTC (permalink / raw
To: gentoo-commits
commit: 672fc0b8c265436eba44b3286a115cf19dd97d52
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 06:29:30 2017 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 06:35:23 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=672fc0b8
dev-util/perf: version bump
Gentoo-Bug: 596700
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-util/perf/Manifest | 2 +
dev-util/perf/perf-4.9.13.ebuild | 177 +++++++++++++++++++++++++++++++++++++++
2 files changed, 179 insertions(+)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index f2797b1d42..8509741420 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -3,7 +3,9 @@ DIST linux-3.13.tar.xz 77187032 SHA256 4d5e5eee5f276424c32e9591f1b6c971baedc7b49
DIST linux-3.15.tar.xz 79676484 SHA256 c3927e87be4040fa8aca1b58663dc0776aaf00485604ff88a623be2f3fb07794 SHA512 d5dc477cad4584e56e2e2ef9e0950c2b22e76e5cf5090a896ba099cb7c5e5db1853a4aeb96b199189653dc66d461557e95198e37516a619f7ddc01ba6b308e02 WHIRLPOOL 7f3dfde1a23aab75b7f40770ae2ca77c1b28f845e4abe6296b2aec9b56fe94f7afa76b00eb6cc7475305c31b726ebeb4643107dd48c12ac04c933cf1856b8e77
DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8
DIST linux-4.4.tar.xz 87295988 SHA256 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e WHIRLPOOL 02abc203d867404b9934aaa4c1e5b5dcbb0b0021e91a03f3a7e7fd224eed106821d8b4949f32a590536db150e5a88c16fcde88538777a26d0c17900f0257b1bc
+DIST linux-4.9.tar.xz 93192404 SHA256 029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a WHIRLPOOL 072505b29972ad120eb25a074217847c9c2813416c4903e605a0433574f5f87616dbea0b1454e4b19acc48107f11274b682958b1d773373156e99f8163e6606a
DIST patch-3.13.1.xz 2884 SHA256 74a093b2cacddac0a105e0989b7bf0e9829b9923e2d71ca10382e90324a17e74 SHA512 164235a15e6a984e9aeaf9fe475a8b2975d5e4c4b28dd4ecf99064b0f0c72eea766d925340f1a7232cabcbd23d26773527c300b6d995bf5cde18a276208fdccc WHIRLPOOL 0ea0118960970b7d6465445252e7a21a6aeb494c0afefec5f52a68c0b7e0d63fd2ed59a3877fbe9ebd282ac03812235b021534866efa8f46d549b6f70228e4b6
DIST patch-3.15.5.xz 122232 SHA256 9b0d000e0bdec7a25ee6303afdab8d2af77439995876eadd6ce248e5c954037d SHA512 6831200503334e839c3cccdad29058aecc0205171cc5b75205d0a2aada8636633889ebff35d9677d4567bbaeea249efc83571e016104cd67554fe72b3b405755 WHIRLPOOL 56e1e817c08b4557e18b34d148d8ffd0f73bf8dec92f2339ca9413ca2143b65ec35f6d48c87e37f140226e57d7df33f06d6c53a48dafa7ddf090a839fdabe024
DIST patch-4.1.5.xz 170056 SHA256 b495cf8a7b978986dd2b757b687751c62f635d15cc2228edb80934bc0d449dcc SHA512 1325cdb35ea1f277d513932af37804f788b96ae63b94cedeb3c9b916ee8963bbd6aca5d0e13279e36a81f1de06005c5f3666ecfc845609932686f261fa4250c5 WHIRLPOOL 291ddfcde395c3d201a8172f7281ac560167a8bce78d3196b47e4c7be759545282cc1104fc7b2edc95d90250a834cc23103199275bc8c6974bd4229dd530d1a3
DIST patch-4.4.4.xz 200972 SHA256 9061d8f57cc25d760387c4e6b7d5cceacaa808e8784a3e478012e7c2949853c8 SHA512 c206af7803cb0915fbe2bd27ed33282452db3fbd3070c73e4c7147443efd3c7588fb3be12d0abc08742381fbe892190602b29147684630aa9e6ff5e9efa49dbc WHIRLPOOL e6a004e32eecca1507354f97d3de85a07c1b9512fe3d4d87173e6d39c02ef1c2411abd0c26b6a077cd5eaefde11dd201445f72b9a0cf185e76635bdcc36df8dd
+DIST patch-4.9.13.xz 295932 SHA256 87a0f07dd393e2d08850f0536417d091684535ff0c8ab8f8d9aeab1db38589bf SHA512 d7956cc8a4ab11514789af4f1f7023268e4b003216766c153f0f09aac659aabda5de634b363d53f8daeddfcf5820619c5bca31ff5f9aeb187c1df016c05f68d5 WHIRLPOOL 154747030245f5c1e9f6d9717c32584e3901372fdfe7945497b294c7454f2da4ae4959cf9f1bdd091dca70d346125023a0b5d0c75cc3745342eb8bb56c68e023
diff --git a/dev-util/perf/perf-4.9.13.ebuild b/dev-util/perf/perf-4.9.13.ebuild
new file mode 100644
index 0000000000..b516617b25
--- /dev/null
+++ b/dev-util/perf/perf-4.9.13.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+inherit bash-completion-r1 versionator eutils toolchain-funcs python-single-r1 linux-info
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+ LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
+ PATCH_VERSION=$(get_version_component_range 1-3)
+ LINUX_PATCH=patch-${PV//_/-}.xz
+ SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+ mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+else
+ VER_COUNT=$(get_version_component_count)
+ if [[ ${VER_COUNT} -gt 2 ]] ; then
+ # stable-release series
+ LINUX_VER=$(get_version_component_range 1-2)
+ LINUX_PATCH=patch-${PV}.xz
+ SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+ else
+ LINUX_VER=${PV}
+ SRC_URI=""
+ fi
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="audit debug +demangle +doc gtk numa perl python slang unwind"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="audit? ( sys-process/audit )
+ demangle? ( sys-devel/binutils:= )
+ gtk? ( x11-libs/gtk+:2 )
+ numa? ( sys-process/numactl )
+ perl? ( dev-lang/perl )
+ slang? ( dev-libs/newt )
+ unwind? ( sys-libs/libunwind )
+ dev-libs/elfutils"
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-4.4
+ ${LINUX_PATCH+dev-util/patchutils}
+ sys-devel/bison
+ sys-devel/flex
+ doc? (
+ app-text/asciidoc
+ app-text/sgml-common
+ app-text/xmlto
+ sys-process/time
+ )
+ python? ( ${PYTHON_DEPS} )"
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
+CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+
+pkg_setup() {
+ linux-info_pkg_setup
+ use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+ local paths=(
+ tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
+ include lib "arch/*/lib"
+ )
+
+ # We expect the tar implementation to support the -j option (both
+ # GNU tar and libarchive's tar support that).
+ echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+ tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+ "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ eshopts_push -o noglob
+ ebegin "Filtering partial source patch"
+ filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+ > ${P}.patch || die
+ eend $? || die "filterdiff failed"
+ eshopts_pop
+ fi
+
+ local a
+ for a in ${A}; do
+ [[ ${a} == ${LINUX_SOURCES} ]] && continue
+ [[ ${a} == ${LINUX_PATCH} ]] && continue
+ unpack ${a}
+ done
+}
+
+src_prepare() {
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ cd "${S_K}"
+ epatch "${WORKDIR}"/${P}.patch
+ 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
+ sed -i -e 's:-Werror::' "${S_K}"/tools/lib/api/Makefile || die
+
+ # Avoid the call to make kernelversion
+ echo "#define PERF_VERSION \"${MY_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' {} +
+}
+
+puse() { usex $1 "" no; }
+perf_make() {
+ # The arch parsing is a bit funky. The perf tools package is integrated
+ # into the kernel, so it wants an ARCH that looks like the kernel arch,
+ # but it also wants to know about the split value -- i386/x86_64 vs just
+ # x86. We can get that by telling the func to use an older linux version.
+ # It's kind of a hack, but not that bad ...
+ local arch=$(tc-arch-kernel)
+ emake V=1 \
+ CC="$(tc-getCC)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
+ prefix="/usr" bindir_relative="bin" \
+ EXTRA_CFLAGS="${CFLAGS}" \
+ ARCH="${arch}" \
+ NO_DEMANGLE=$(puse demangle) \
+ NO_GTK2=$(puse gtk) \
+ NO_LIBAUDIT=$(puse audit) \
+ NO_LIBPERL=$(puse perl) \
+ NO_LIBPYTHON=$(puse python) \
+ NO_LIBUNWIND=$(puse unwind) \
+ NO_NEWT=$(puse slang) \
+ NO_LIBNUMA=$(puse numa) \
+ WERROR=0 \
+ "$@"
+}
+
+src_compile() {
+ perf_make -f Makefile.perf
+ use doc && perf_make -C Documentation
+}
+
+src_test() {
+ :
+}
+
+src_install() {
+ perf_make -f Makefile.perf install DESTDIR="${D}"
+
+ dodoc CREDITS
+
+ dodoc *txt Documentation/*.txt
+ if use doc ; then
+ dohtml Documentation/*.html
+ doman Documentation/*.1
+ fi
+}
+
+pkg_postinst() {
+ if ! use doc ; then
+ elog "Without the doc USE flag you won't get any documentation nor man pages."
+ elog "And without man pages, you won't get any --help output for perf and its"
+ elog "sub-tools."
+ fi
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2017-02-28 6:35 Yixun Lan
0 siblings, 0 replies; 141+ messages in thread
From: Yixun Lan @ 2017-02-28 6:35 UTC (permalink / raw
To: gentoo-commits
commit: ea636c19348da7cf0cca385f4263e3f5f639f0ae
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 06:31:03 2017 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 06:35:23 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea636c19
dev-util/perf: add myself to maintainer list
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-util/perf/metadata.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/dev-util/perf/metadata.xml b/dev-util/perf/metadata.xml
index ec35d2efce..1b50bf7e52 100644
--- a/dev-util/perf/metadata.xml
+++ b/dev-util/perf/metadata.xml
@@ -4,6 +4,10 @@
<maintainer type="person">
<email>naota@gentoo.org</email>
</maintainer>
+ <maintainer type="person">
+ <email>dlan@gentoo.org</email>
+ <name>Yixun Lan</name>
+ </maintainer>
<use>
<flag name="demangle">
Enable C++ symbol name demangling, using libbfd from
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2017-04-20 20:48 David Seifert
0 siblings, 0 replies; 141+ messages in thread
From: David Seifert @ 2017-04-20 20:48 UTC (permalink / raw
To: gentoo-commits
commit: 918b567b1c71487eb002190f690cc0fe6ab7642c
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 20 20:20:14 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Apr 20 20:47:23 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=918b567b
dev-util/perf: [QA] Add missing python metadata variables
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-util/perf/perf-3.12.ebuild | 6 +++---
dev-util/perf/perf-3.13.1-r1.ebuild | 6 +++---
dev-util/perf/perf-3.15.5.ebuild | 6 +++---
dev-util/perf/perf-4.1.5-r1.ebuild | 6 +++---
dev-util/perf/perf-4.4.4.ebuild | 6 +++---
dev-util/perf/perf-4.9.13.ebuild | 4 ++--
6 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/dev-util/perf/perf-3.12.ebuild b/dev-util/perf/perf-3.12.ebuild
index 7e3b25854f5..9b930d58dec 100644
--- a/dev-util/perf/perf-3.12.ebuild
+++ b/dev-util/perf/perf-3.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -41,6 +41,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="audit? ( sys-process/audit )
demangle? ( sys-devel/binutils )
perl? ( dev-lang/perl )
+ python? ( ${PYTHON_DEPS} )
slang? ( dev-libs/newt )
unwind? ( sys-libs/libunwind )
dev-libs/elfutils"
@@ -53,8 +54,7 @@ DEPEND="${RDEPEND}
app-text/sgml-common
app-text/xmlto
sys-process/time
- )
- python? ( ${PYTHON_DEPS} )"
+ )"
S_K="${WORKDIR}/linux-${LINUX_VER}"
S="${S_K}/tools/perf"
diff --git a/dev-util/perf/perf-3.13.1-r1.ebuild b/dev-util/perf/perf-3.13.1-r1.ebuild
index 74721ec01d5..39c962d6d05 100644
--- a/dev-util/perf/perf-3.13.1-r1.ebuild
+++ b/dev-util/perf/perf-3.13.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -45,6 +45,7 @@ RDEPEND="audit? ( sys-process/audit )
demangle? ( sys-devel/binutils )
gtk? ( x11-libs/gtk+:2 )
perl? ( dev-lang/perl )
+ python? ( ${PYTHON_DEPS} )
slang? ( dev-libs/newt )
unwind? ( sys-libs/libunwind )
dev-libs/elfutils"
@@ -57,8 +58,7 @@ DEPEND="${RDEPEND}
app-text/sgml-common
app-text/xmlto
sys-process/time
- )
- python? ( ${PYTHON_DEPS} )"
+ )"
S_K="${WORKDIR}/linux-${LINUX_VER}"
S="${S_K}/tools/perf"
diff --git a/dev-util/perf/perf-3.15.5.ebuild b/dev-util/perf/perf-3.15.5.ebuild
index c1a18149065..c2e5a6f47f2 100644
--- a/dev-util/perf/perf-3.15.5.ebuild
+++ b/dev-util/perf/perf-3.15.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -45,6 +45,7 @@ RDEPEND="audit? ( sys-process/audit )
demangle? ( sys-devel/binutils )
gtk? ( x11-libs/gtk+:2 )
perl? ( dev-lang/perl )
+ python? ( ${PYTHON_DEPS} )
slang? ( dev-libs/newt )
unwind? ( sys-libs/libunwind )
dev-libs/elfutils"
@@ -57,8 +58,7 @@ DEPEND="${RDEPEND}
app-text/sgml-common
app-text/xmlto
sys-process/time
- )
- python? ( ${PYTHON_DEPS} )"
+ )"
S_K="${WORKDIR}/linux-${LINUX_VER}"
S="${S_K}/tools/perf"
diff --git a/dev-util/perf/perf-4.1.5-r1.ebuild b/dev-util/perf/perf-4.1.5-r1.ebuild
index 9f0b9a9070e..4fdec292a19 100644
--- a/dev-util/perf/perf-4.1.5-r1.ebuild
+++ b/dev-util/perf/perf-4.1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -46,6 +46,7 @@ RDEPEND="audit? ( sys-process/audit )
gtk? ( x11-libs/gtk+:2 )
numa? ( sys-process/numactl )
perl? ( dev-lang/perl )
+ python? ( ${PYTHON_DEPS} )
slang? ( dev-libs/newt )
unwind? ( sys-libs/libunwind )
dev-libs/elfutils"
@@ -58,8 +59,7 @@ DEPEND="${RDEPEND}
app-text/sgml-common
app-text/xmlto
sys-process/time
- )
- python? ( ${PYTHON_DEPS} )"
+ )"
S_K="${WORKDIR}/linux-${LINUX_VER}"
S="${S_K}/tools/perf"
diff --git a/dev-util/perf/perf-4.4.4.ebuild b/dev-util/perf/perf-4.4.4.ebuild
index 03931c69b0c..a1366ba16e6 100644
--- a/dev-util/perf/perf-4.4.4.ebuild
+++ b/dev-util/perf/perf-4.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -46,6 +46,7 @@ RDEPEND="audit? ( sys-process/audit )
gtk? ( x11-libs/gtk+:2 )
numa? ( sys-process/numactl )
perl? ( dev-lang/perl )
+ python? ( ${PYTHON_DEPS} )
slang? ( dev-libs/newt )
unwind? ( sys-libs/libunwind )
dev-libs/elfutils"
@@ -59,8 +60,7 @@ DEPEND="${RDEPEND}
app-text/sgml-common
app-text/xmlto
sys-process/time
- )
- python? ( ${PYTHON_DEPS} )"
+ )"
S_K="${WORKDIR}/linux-${LINUX_VER}"
S="${S_K}/tools/perf"
diff --git a/dev-util/perf/perf-4.9.13.ebuild b/dev-util/perf/perf-4.9.13.ebuild
index 3f7ee923738..52ad3a53f5a 100644
--- a/dev-util/perf/perf-4.9.13.ebuild
+++ b/dev-util/perf/perf-4.9.13.ebuild
@@ -46,6 +46,7 @@ RDEPEND="audit? ( sys-process/audit )
gtk? ( x11-libs/gtk+:2 )
numa? ( sys-process/numactl )
perl? ( dev-lang/perl )
+ python? ( ${PYTHON_DEPS} )
slang? ( dev-libs/newt )
unwind? ( sys-libs/libunwind )
dev-libs/elfutils"
@@ -59,8 +60,7 @@ DEPEND="${RDEPEND}
app-text/sgml-common
app-text/xmlto
sys-process/time
- )
- python? ( ${PYTHON_DEPS} )"
+ )"
S_K="${WORKDIR}/linux-${LINUX_VER}"
S="${S_K}/tools/perf"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2017-05-24 14:51 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2017-05-24 14:51 UTC (permalink / raw
To: gentoo-commits
commit: 1181247f968f4930c8f95e1028c3eb595583b2fa
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Wed May 24 14:50:36 2017 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Wed May 24 14:50:36 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1181247f
dev-util/perf: Prefix support
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-util/perf/perf-4.9.13.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-util/perf/perf-4.9.13.ebuild b/dev-util/perf/perf-4.9.13.ebuild
index 52ad3a53f5a..97f3a8aa355 100644
--- a/dev-util/perf/perf-4.9.13.ebuild
+++ b/dev-util/perf/perf-4.9.13.ebuild
@@ -37,7 +37,7 @@ SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="audit debug +demangle +doc gtk numa perl python slang unwind"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -131,7 +131,7 @@ perf_make() {
local arch=$(tc-arch-kernel)
emake V=1 \
CC="$(tc-getCC)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
- prefix="/usr" bindir_relative="bin" \
+ prefix="${EPREFIX}/usr" bindir_relative="bin" \
EXTRA_CFLAGS="${CFLAGS}" \
ARCH="${arch}" \
NO_DEMANGLE=$(puse demangle) \
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2017-06-02 0:18 Jason Donenfeld
0 siblings, 0 replies; 141+ messages in thread
From: Jason Donenfeld @ 2017-06-02 0:18 UTC (permalink / raw
To: gentoo-commits
commit: ccf5bffd903d653336bfd0e57f9dd003868a5c52
Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 2 00:16:44 2017 +0000
Commit: Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 2 00:18:36 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccf5bffd
dev-util/perf: fix dep on libbfd
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-util/perf/perf-4.9.13.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-util/perf/perf-4.9.13.ebuild b/dev-util/perf/perf-4.9.13.ebuild
index 97f3a8aa355..99c34d5b4c5 100644
--- a/dev-util/perf/perf-4.9.13.ebuild
+++ b/dev-util/perf/perf-4.9.13.ebuild
@@ -42,7 +42,7 @@ IUSE="audit debug +demangle +doc gtk numa perl python slang unwind"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="audit? ( sys-process/audit )
- demangle? ( sys-devel/binutils:= )
+ demangle? ( sys-libs/binutils-libs:= )
gtk? ( x11-libs/gtk+:2 )
numa? ( sys-process/numactl )
perl? ( dev-lang/perl )
@@ -51,7 +51,7 @@ RDEPEND="audit? ( sys-process/audit )
unwind? ( sys-libs/libunwind )
dev-libs/elfutils"
DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-4.4
+ >=sys-kernel/linux-headers-4.9
${LINUX_PATCH+dev-util/patchutils}
sys-devel/bison
sys-devel/flex
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2017-11-26 11:39 David Seifert
0 siblings, 0 replies; 141+ messages in thread
From: David Seifert @ 2017-11-26 11:39 UTC (permalink / raw
To: gentoo-commits
commit: 335ca1f2fbbdd49065b7be1ad23fee8eb585baff
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 25 22:44:46 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov 26 11:38:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=335ca1f2
dev-util/perf: [QA] Consistent whitespace in metadata.xml
dev-util/perf/metadata.xml | 58 +++++++++++++++++++++++-----------------------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/dev-util/perf/metadata.xml b/dev-util/perf/metadata.xml
index 1b50bf7e527..abff870927b 100644
--- a/dev-util/perf/metadata.xml
+++ b/dev-util/perf/metadata.xml
@@ -1,33 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>naota@gentoo.org</email>
- </maintainer>
- <maintainer type="person">
- <email>dlan@gentoo.org</email>
- <name>Yixun Lan</name>
- </maintainer>
- <use>
- <flag name="demangle">
- Enable C++ symbol name demangling, using libbfd from
- <pkg>sys-devel/binutils</pkg>. When this flag is enabled, the
- package will have to be rebuilt after every version bump of
- binutils.
- </flag>
- <flag name="doc">
- Build documentation and man pages. With this USE flag disabled,
- the --help parameter for perf and its sub-tools will not be
- available. This is optional because it depends on a few
- documentation handling tools that are not always welcome on user
- systems.
- </flag>
- <flag name="numa">Enable NUMA support</flag>
- <flag name="perl">
- Add support for Perl as a scripting language for perf tools.
- </flag>
- <flag name="unwind">
- Use sys-libs/libunwind for frame unwinding support.
- </flag>
- </use>
+ <maintainer type="person">
+ <email>naota@gentoo.org</email>
+ </maintainer>
+ <maintainer type="person">
+ <email>dlan@gentoo.org</email>
+ <name>Yixun Lan</name>
+ </maintainer>
+ <use>
+ <flag name="demangle">
+ Enable C++ symbol name demangling, using libbfd from
+ <pkg>sys-devel/binutils</pkg>. When this flag is enabled, the
+ package will have to be rebuilt after every version bump of
+ binutils.
+ </flag>
+ <flag name="doc">
+ Build documentation and man pages. With this USE flag disabled,
+ the --help parameter for perf and its sub-tools will not be
+ available. This is optional because it depends on a few
+ documentation handling tools that are not always welcome on user
+ systems.
+ </flag>
+ <flag name="numa">Enable NUMA support</flag>
+ <flag name="perl">
+ Add support for Perl as a scripting language for perf tools.
+ </flag>
+ <flag name="unwind">
+ Use sys-libs/libunwind for frame unwinding support.
+ </flag>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2018-01-11 1:34 Mike Frysinger
0 siblings, 0 replies; 141+ messages in thread
From: Mike Frysinger @ 2018-01-11 1:34 UTC (permalink / raw
To: gentoo-commits
commit: 0c386fa287ecc474995b49e492fe5ec4184bed4a
Author: Mike Frysinger <vapier <AT> chromium <DOT> org>
AuthorDate: Thu Jan 11 01:31:47 2018 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Jan 11 01:33:54 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c386fa2
dev-util/perf: clean up -Werror usage
The api/Makefile already checks $(WERROR), so no need to mung it anymore.
dev-util/perf/perf-4.9.13.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-4.9.13.ebuild b/dev-util/perf/perf-4.9.13.ebuild
index 99c34d5b4c5..f63b5111580 100644
--- a/dev-util/perf/perf-4.9.13.ebuild
+++ b/dev-util/perf/perf-4.9.13.ebuild
@@ -112,7 +112,9 @@ src_prepare() {
sed -i \
-e "s:\$(sysconfdir_SQ)/bash_completion.d:$(get_bashcompdir):" \
"${S}"/Makefile.perf || die
- sed -i -e 's:-Werror::' "${S_K}"/tools/lib/api/Makefile || 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
echo "#define PERF_VERSION \"${MY_PV}\"" > PERF-VERSION-FILE
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2018-03-17 17:11 Matt Turner
0 siblings, 0 replies; 141+ messages in thread
From: Matt Turner @ 2018-03-17 17:11 UTC (permalink / raw
To: gentoo-commits
commit: 7dc653c96e85bc3bf1cf51deaf2550cc3b4546cd
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 17 17:09:54 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Mar 17 17:11:17 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dc653c9
dev-util/perf-4.9.13: added ~alpha, bug 599310
dev-util/perf/perf-4.9.13.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-4.9.13.ebuild b/dev-util/perf/perf-4.9.13.ebuild
index f63b5111580..fd50602fb58 100644
--- a/dev-util/perf/perf-4.9.13.ebuild
+++ b/dev-util/perf/perf-4.9.13.ebuild
@@ -37,7 +37,7 @@ SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="audit debug +demangle +doc gtk numa perl python slang unwind"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2018-03-26 4:05 Matt Turner
0 siblings, 0 replies; 141+ messages in thread
From: Matt Turner @ 2018-03-26 4:05 UTC (permalink / raw
To: gentoo-commits
commit: 74bc49df81993838cdd773b6d28e91bf3a9b3156
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 26 04:05:37 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Mar 26 04:05:37 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74bc49df
dev-util/perf-4.9.13: added ~mips, bug 599310
dev-util/perf/perf-4.9.13.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-4.9.13.ebuild b/dev-util/perf/perf-4.9.13.ebuild
index fd50602fb58..5041aed3f5f 100644
--- a/dev-util/perf/perf-4.9.13.ebuild
+++ b/dev-util/perf/perf-4.9.13.ebuild
@@ -37,7 +37,7 @@ SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="audit debug +demangle +doc gtk numa perl python slang unwind"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2018-04-20 13:47 Yixun Lan
0 siblings, 0 replies; 141+ messages in thread
From: Yixun Lan @ 2018-04-20 13:47 UTC (permalink / raw
To: gentoo-commits
commit: 5854072de7dd58a322b51595d82d247b82efbfa9
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 20 13:45:31 2018 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Fri Apr 20 13:47:45 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5854072d
dev-util/perf: version bump 4.14.33
Package-Manager: Portage-2.3.19, Repoman-2.3.6
dev-util/perf/Manifest | 2 +
dev-util/perf/perf-4.14.33.ebuild | 179 ++++++++++++++++++++++++++++++++++++++
2 files changed, 181 insertions(+)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 92b46aeb9f4..e27fa76da1a 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -2,10 +2,12 @@ DIST linux-3.12.tar.bz2 91111381 BLAKE2B ec3295f41b639f0a7c63eed5d5be4a53c435ddb
DIST linux-3.13.tar.xz 77187032 BLAKE2B 4c0d96a9f1f8f971b9886651a1a0438bd7e00c3eb5de6b52c599c0e621714e34f4048348e836bc8bf8d0c879d447569ee99adda09c3de2fc197ce9503bc2b568 SHA512 1ba223bb4b885d691a67196d86a8aaf7b4a1c351bf2a762f50f1b0c32da00dd0c28895872a66b49e8d244498d996876609268e64861d28ac4048886ef9f79b87
DIST linux-3.15.tar.xz 79676484 BLAKE2B a21b0b97fe0c9c2ef032b10b71062065fe0d27417f7f51c2ca4215891d254fef00aec11d20bfa4f7a71937f7e307a18f4c3ab08e45b9600816cd1c9dfe6c8fbb SHA512 d5dc477cad4584e56e2e2ef9e0950c2b22e76e5cf5090a896ba099cb7c5e5db1853a4aeb96b199189653dc66d461557e95198e37516a619f7ddc01ba6b308e02
DIST linux-4.1.tar.xz 83017828 BLAKE2B d1dc4e458db191f16306b3d2d7eb60ef5e04307406c769cccdd88beb407f8de228ab1f095a44d6e992b06d01cd896fda31dec1cdf16667f4ca0b628da594aee3 SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0
+DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
DIST patch-3.13.1.xz 2884 BLAKE2B 6fd04189866fa50efb48c3c979de2880231dcb06b857a67eab18321a589bbab611bb1a2df68adae513d16e9e3ca897b8533a677121e1c7c430f7027044f899f1 SHA512 164235a15e6a984e9aeaf9fe475a8b2975d5e4c4b28dd4ecf99064b0f0c72eea766d925340f1a7232cabcbd23d26773527c300b6d995bf5cde18a276208fdccc
DIST patch-3.15.5.xz 122232 BLAKE2B 9c138316beea8ea04b704baca23621c76291064ac72a5eb107bcec4f371c2680471f96c678e269d04b03eaa857dc054ddd8057a06e5c7ac2b7ea8a303468139b SHA512 6831200503334e839c3cccdad29058aecc0205171cc5b75205d0a2aada8636633889ebff35d9677d4567bbaeea249efc83571e016104cd67554fe72b3b405755
DIST patch-4.1.5.xz 170056 BLAKE2B 3beee64274154565bbe80389fe6258228f388ad5fa77a69e4d83906755c746bfd9d6052bf224d0f1bad33c4b656c1b6538345d05efd3e4f3953495241c05f0c8 SHA512 1325cdb35ea1f277d513932af37804f788b96ae63b94cedeb3c9b916ee8963bbd6aca5d0e13279e36a81f1de06005c5f3666ecfc845609932686f261fa4250c5
+DIST patch-4.14.33.xz 905284 BLAKE2B e67bd9a96708aaaf65eb0aa852493b2323c9e237bfcc6fa837f795e481943ead3e2d5005ee72e40fc247df01c50877d9da3848a05aba3c999c3cfb7678cbdbc9 SHA512 5c76be5171709c2df7df7d5a8e8f3d0f7ede47b433da3b0f1710f262c8fcf5cf6c744a96d4336ea397c2c88a5f0a7507a5ab08c7c82f08deeb7a6f887ad77cfd
DIST patch-4.4.4.xz 200972 BLAKE2B 76f5505fae96c6ec21ef3480c54bd53d7021d9ec360527209dd16b069d5f7c65ab8f1e44aeeed49480cd7c2a685fd42852e062fff703a1d010cc487f55ec15fa SHA512 c206af7803cb0915fbe2bd27ed33282452db3fbd3070c73e4c7147443efd3c7588fb3be12d0abc08742381fbe892190602b29147684630aa9e6ff5e9efa49dbc
DIST patch-4.9.13.xz 295932 BLAKE2B 37a90811dc1591d3f5d6609185ae518b02b36827c8557e400e7bb359ea04bf9cee66ea74fceaefb02c6e145ac34697efaecca6db071b35d6d872c9ac7c84b9ab SHA512 d7956cc8a4ab11514789af4f1f7023268e4b003216766c153f0f09aac659aabda5de634b363d53f8daeddfcf5820619c5bca31ff5f9aeb187c1df016c05f68d5
diff --git a/dev-util/perf/perf-4.14.33.ebuild b/dev-util/perf/perf-4.14.33.ebuild
new file mode 100644
index 00000000000..c7290b313e2
--- /dev/null
+++ b/dev-util/perf/perf-4.14.33.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit bash-completion-r1 versionator eutils toolchain-funcs python-single-r1 linux-info
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+ LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
+ PATCH_VERSION=$(get_version_component_range 1-3)
+ LINUX_PATCH=patch-${PV//_/-}.xz
+ SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+ mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+else
+ VER_COUNT=$(get_version_component_count)
+ if [[ ${VER_COUNT} -gt 2 ]] ; then
+ # stable-release series
+ LINUX_VER=$(get_version_component_range 1-2)
+ LINUX_PATCH=patch-${PV}.xz
+ SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+ else
+ LINUX_VER=${PV}
+ SRC_URI=""
+ fi
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit debug +demangle +doc gtk numa perl python slang unwind"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="audit? ( sys-process/audit )
+ demangle? ( sys-libs/binutils-libs:= )
+ gtk? ( x11-libs/gtk+:2 )
+ numa? ( sys-process/numactl )
+ perl? ( dev-lang/perl )
+ python? ( ${PYTHON_DEPS} )
+ slang? ( dev-libs/newt )
+ unwind? ( sys-libs/libunwind )
+ dev-libs/elfutils"
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-4.9
+ ${LINUX_PATCH+dev-util/patchutils}
+ sys-devel/bison
+ sys-devel/flex
+ 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"
+
+CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+
+pkg_setup() {
+ linux-info_pkg_setup
+ use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+ local paths=(
+ tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
+ include lib "arch/*/lib"
+ )
+
+ # We expect the tar implementation to support the -j option (both
+ # GNU tar and libarchive's tar support that).
+ echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+ tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+ "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ eshopts_push -o noglob
+ ebegin "Filtering partial source patch"
+ filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+ > ${P}.patch || die
+ eend $? || die "filterdiff failed"
+ eshopts_pop
+ fi
+
+ local a
+ for a in ${A}; do
+ [[ ${a} == ${LINUX_SOURCES} ]] && continue
+ [[ ${a} == ${LINUX_PATCH} ]] && continue
+ unpack ${a}
+ done
+}
+
+src_prepare() {
+ default
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ cd "${S_K}"
+ eapply "${WORKDIR}"/${P}.patch
+ 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
+ echo "#define PERF_VERSION \"${MY_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' {} +
+}
+
+puse() { usex $1 "" no; }
+perf_make() {
+ # The arch parsing is a bit funky. The perf tools package is integrated
+ # into the kernel, so it wants an ARCH that looks like the kernel arch,
+ # but it also wants to know about the split value -- i386/x86_64 vs just
+ # x86. We can get that by telling the func to use an older linux version.
+ # It's kind of a hack, but not that bad ...
+ local arch=$(tc-arch-kernel)
+ emake V=1 \
+ CC="$(tc-getCC)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
+ prefix="${EPREFIX}/usr" bindir_relative="bin" \
+ EXTRA_CFLAGS="${CFLAGS}" \
+ ARCH="${arch}" \
+ NO_DEMANGLE=$(puse demangle) \
+ NO_GTK2=$(puse gtk) \
+ NO_LIBAUDIT=$(puse audit) \
+ NO_LIBPERL=$(puse perl) \
+ NO_LIBPYTHON=$(puse python) \
+ NO_LIBUNWIND=$(puse unwind) \
+ NO_NEWT=$(puse slang) \
+ NO_LIBNUMA=$(puse numa) \
+ WERROR=0 \
+ "$@"
+}
+
+src_compile() {
+ perf_make -f Makefile.perf
+ use doc && perf_make -C Documentation
+}
+
+src_test() {
+ :
+}
+
+src_install() {
+ perf_make -f Makefile.perf install DESTDIR="${D}"
+
+ dodoc CREDITS
+
+ dodoc *txt Documentation/*.txt
+ if use doc ; then
+ HTML_DOCS="Documentation/*.html" einstalldocs
+ doman Documentation/*.1
+ fi
+}
+
+pkg_postinst() {
+ if ! use doc ; then
+ elog "Without the doc USE flag you won't get any documentation nor man pages."
+ elog "And without man pages, you won't get any --help output for perf and its"
+ elog "sub-tools."
+ fi
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2018-04-23 14:50 Aaron Bauman
0 siblings, 0 replies; 141+ messages in thread
From: Aaron Bauman @ 2018-04-23 14:50 UTC (permalink / raw
To: gentoo-commits
commit: 9b1df32274ba1e0ab1e6f8768f8cce034697503b
Author: Luke Dashjr <luke-jr+git <AT> utopios <DOT> org>
AuthorDate: Wed Apr 18 03:21:03 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Apr 23 14:50:29 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b1df322
dev-util/perf: Keyword 4.9.13 ~ppc64
dev-util/perf/perf-4.9.13.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-4.9.13.ebuild b/dev-util/perf/perf-4.9.13.ebuild
index 5041aed3f5f..e9c0e8f0c42 100644
--- a/dev-util/perf/perf-4.9.13.ebuild
+++ b/dev-util/perf/perf-4.9.13.ebuild
@@ -37,7 +37,7 @@ SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="audit debug +demangle +doc gtk numa perl python slang unwind"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2018-06-04 19:25 Mart Raudsepp
0 siblings, 0 replies; 141+ messages in thread
From: Mart Raudsepp @ 2018-06-04 19:25 UTC (permalink / raw
To: gentoo-commits
commit: 8d653f831d5f0b11a6b286a98ce0d4800f9ec2ec
Author: Alex Bennée <alex.bennee <AT> linaro <DOT> org>
AuthorDate: Fri May 18 09:23:06 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Jun 4 18:57:09 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d653f83
dev-util/perf: add ~arm64 keyword
dev-util/perf/perf-4.14.33.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-4.14.33.ebuild b/dev-util/perf/perf-4.14.33.ebuild
index c7290b313e2..60953040271 100644
--- a/dev-util/perf/perf-4.14.33.ebuild
+++ b/dev-util/perf/perf-4.14.33.ebuild
@@ -37,7 +37,7 @@ SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="audit debug +demangle +doc gtk numa perl python slang unwind"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2018-09-04 13:04 Luca Barbato
0 siblings, 0 replies; 141+ messages in thread
From: Luca Barbato @ 2018-09-04 13:04 UTC (permalink / raw
To: gentoo-commits
commit: 48ee4f34e00dfb69c479cccc8cc6599ec08a5d30
Author: Luca Barbato <lu_zero <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 4 13:03:38 2018 +0000
Commit: Luca Barbato <lu_zero <AT> gentoo <DOT> org>
CommitDate: Tue Sep 4 13:03:38 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48ee4f34
dev-util/perf: Mark ~ppc64
Package-Manager: Portage-2.3.48, Repoman-2.3.10
dev-util/perf/perf-4.14.33.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-4.14.33.ebuild b/dev-util/perf/perf-4.14.33.ebuild
index 60953040271..dc982eb33d6 100644
--- a/dev-util/perf/perf-4.14.33.ebuild
+++ b/dev-util/perf/perf-4.14.33.ebuild
@@ -37,7 +37,7 @@ SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="audit debug +demangle +doc gtk numa perl python slang unwind"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2018-10-15 2:26 Naohiro Aota
0 siblings, 0 replies; 141+ messages in thread
From: Naohiro Aota @ 2018-10-15 2:26 UTC (permalink / raw
To: gentoo-commits
commit: 59d2bb43bf1374b23ec718321ac839033cfb7b44
Author: Naohiro Aota <naota <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 15 02:25:26 2018 +0000
Commit: Naohiro Aota <naota <AT> gentoo <DOT> org>
CommitDate: Mon Oct 15 02:25:53 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59d2bb43
dev-util/perf: move in-package library to its dedicated directory
/usr/lib64/libperf-gtk.so is solely used by this package. So I moved the
library to its dedicated directory: /usr/libexec/perf-core. To let the
perf command find the library, use LIBDIR config to include the
directory to search path list.
Signed-off-by: Naohiro Aota <naota <AT> gentoo.org>
Closes: https://bugs.gentoo.org/515954
Package-Manager: Portage-2.3.51, Repoman-2.3.11
dev-util/perf/perf-4.14.33-r1.ebuild | 185 +++++++++++++++++++++++++++++++++++
1 file changed, 185 insertions(+)
diff --git a/dev-util/perf/perf-4.14.33-r1.ebuild b/dev-util/perf/perf-4.14.33-r1.ebuild
new file mode 100644
index 00000000000..6eb3fa30238
--- /dev/null
+++ b/dev-util/perf/perf-4.14.33-r1.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit bash-completion-r1 eutils toolchain-funcs python-single-r1 linux-info
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+ LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+ PATCH_VERSION=$(ver_cut 1-3)
+ LINUX_PATCH=patch-${PV//_/-}.xz
+ SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+ mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ ${PV} == *.*.* ]] ; then
+ # stable-release series
+ LINUX_VER=$(ver_cut 1-2)
+ LINUX_PATCH=patch-${PV}.xz
+ SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+ LINUX_VER=${PV}
+ SRC_URI=""
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit debug +demangle +doc gtk numa perl python slang unwind"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="audit? ( sys-process/audit )
+ demangle? ( sys-libs/binutils-libs:= )
+ gtk? ( x11-libs/gtk+:2 )
+ numa? ( sys-process/numactl )
+ perl? ( dev-lang/perl )
+ python? ( ${PYTHON_DEPS} )
+ slang? ( dev-libs/newt )
+ unwind? ( sys-libs/libunwind )
+ dev-libs/elfutils"
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-4.9
+ ${LINUX_PATCH+dev-util/patchutils}
+ sys-devel/bison
+ sys-devel/flex
+ 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"
+
+CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+
+pkg_setup() {
+ linux-info_pkg_setup
+ use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+ local paths=(
+ tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
+ include lib "arch/*/lib"
+ )
+
+ # We expect the tar implementation to support the -j option (both
+ # GNU tar and libarchive's tar support that).
+ echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+ tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+ "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ eshopts_push -o noglob
+ ebegin "Filtering partial source patch"
+ filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+ > ${P}.patch || die
+ eend $? || die "filterdiff failed"
+ eshopts_pop
+ fi
+
+ local a
+ for a in ${A}; do
+ [[ ${a} == ${LINUX_SOURCES} ]] && continue
+ [[ ${a} == ${LINUX_PATCH} ]] && continue
+ unpack ${a}
+ done
+}
+
+src_prepare() {
+ default
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ cd "${S_K}"
+ eapply "${WORKDIR}"/${P}.patch
+ 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
+ echo "#define PERF_VERSION \"${MY_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' {} +
+}
+
+puse() { usex $1 "" no; }
+perf_make() {
+ # The arch parsing is a bit funky. The perf tools package is integrated
+ # into the kernel, so it wants an ARCH that looks like the kernel arch,
+ # but it also wants to know about the split value -- i386/x86_64 vs just
+ # x86. We can get that by telling the func to use an older linux version.
+ # It's kind of a hack, but not that bad ...
+
+ # LIBDIR sets a search path of perf-gtk.so. Bug 515954
+
+ local arch=$(tc-arch-kernel)
+ emake V=1 \
+ CC="$(tc-getCC)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
+ prefix="${EPREFIX}/usr" bindir_relative="bin" \
+ EXTRA_CFLAGS="${CFLAGS}" \
+ ARCH="${arch}" \
+ NO_DEMANGLE=$(puse demangle) \
+ NO_GTK2=$(puse gtk) \
+ NO_LIBAUDIT=$(puse audit) \
+ NO_LIBPERL=$(puse perl) \
+ NO_LIBPYTHON=$(puse python) \
+ NO_LIBUNWIND=$(puse unwind) \
+ NO_NEWT=$(puse slang) \
+ NO_LIBNUMA=$(puse numa) \
+ WERROR=0 \
+ LIBDIR="/usr/libexec/perf-core" \
+ "$@"
+}
+
+src_compile() {
+ perf_make -f Makefile.perf
+ use doc && perf_make -C Documentation
+}
+
+src_test() {
+ :
+}
+
+src_install() {
+ perf_make -f Makefile.perf install DESTDIR="${D}"
+
+ if use gtk; then
+ mv "${D}"/usr/$(get_libdir)/libperf-gtk.so \
+ "${D}"/usr/libexec/perf-core || die
+ fi
+
+ dodoc CREDITS
+
+ dodoc *txt Documentation/*.txt
+ if use doc ; then
+ HTML_DOCS="Documentation/*.html" einstalldocs
+ doman Documentation/*.1
+ fi
+}
+
+pkg_postinst() {
+ if ! use doc ; then
+ elog "Without the doc USE flag you won't get any documentation nor man pages."
+ elog "And without man pages, you won't get any --help output for perf and its"
+ elog "sub-tools."
+ fi
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2019-01-18 21:38 Naohiro Aota
0 siblings, 0 replies; 141+ messages in thread
From: Naohiro Aota @ 2019-01-18 21:38 UTC (permalink / raw
To: gentoo-commits
commit: bdc578ddc8bf2e3cf916efbeb2ae0c1f139651c9
Author: Naohiro Aota <naota <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 18 21:34:49 2019 +0000
Commit: Naohiro Aota <naota <AT> gentoo <DOT> org>
CommitDate: Fri Jan 18 21:37:24 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdc578dd
dev-util/perf: version bump to 4.20.3
also drop old versions
Signed-off-by: Naohiro Aota <naota <AT> gentoo.org>
Closes: https://bugs.gentoo.org/659750
Package-Manager: Portage-2.3.56, Repoman-2.3.12
dev-util/perf/Manifest | 13 +-
dev-util/perf/metadata.xml | 4 +
dev-util/perf/perf-3.12.ebuild | 177 -------------------
dev-util/perf/perf-3.13.1-r1.ebuild | 182 --------------------
dev-util/perf/perf-3.15.5.ebuild | 182 --------------------
dev-util/perf/perf-4.1.5-r1.ebuild | 190 ---------------------
.../{perf-4.9.13.ebuild => perf-4.20.3.ebuild} | 97 ++++++++---
dev-util/perf/perf-4.4.4.ebuild | 184 --------------------
8 files changed, 77 insertions(+), 952 deletions(-)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index e27fa76da1a..b137cbd8102 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,13 +1,4 @@
-DIST linux-3.12.tar.bz2 91111381 BLAKE2B ec3295f41b639f0a7c63eed5d5be4a53c435ddb6e3681bce519263c33172efec46c25b284e7c58ef590387dc13b1e2e76d77b67dcd0345e8de7611bb78c9eb5a SHA512 bea14d044c8a0257d8312f45db6a39ca4f9dffe8ac32a11198e90762ee1735c8b6975bb81c635a4755d451793fa7c7e5b2d7d692c9e57133b15b4cdc941febf1
-DIST linux-3.13.tar.xz 77187032 BLAKE2B 4c0d96a9f1f8f971b9886651a1a0438bd7e00c3eb5de6b52c599c0e621714e34f4048348e836bc8bf8d0c879d447569ee99adda09c3de2fc197ce9503bc2b568 SHA512 1ba223bb4b885d691a67196d86a8aaf7b4a1c351bf2a762f50f1b0c32da00dd0c28895872a66b49e8d244498d996876609268e64861d28ac4048886ef9f79b87
-DIST linux-3.15.tar.xz 79676484 BLAKE2B a21b0b97fe0c9c2ef032b10b71062065fe0d27417f7f51c2ca4215891d254fef00aec11d20bfa4f7a71937f7e307a18f4c3ab08e45b9600816cd1c9dfe6c8fbb SHA512 d5dc477cad4584e56e2e2ef9e0950c2b22e76e5cf5090a896ba099cb7c5e5db1853a4aeb96b199189653dc66d461557e95198e37516a619f7ddc01ba6b308e02
-DIST linux-4.1.tar.xz 83017828 BLAKE2B d1dc4e458db191f16306b3d2d7eb60ef5e04307406c769cccdd88beb407f8de228ab1f095a44d6e992b06d01cd896fda31dec1cdf16667f4ca0b628da594aee3 SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0
DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
-DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
-DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
-DIST patch-3.13.1.xz 2884 BLAKE2B 6fd04189866fa50efb48c3c979de2880231dcb06b857a67eab18321a589bbab611bb1a2df68adae513d16e9e3ca897b8533a677121e1c7c430f7027044f899f1 SHA512 164235a15e6a984e9aeaf9fe475a8b2975d5e4c4b28dd4ecf99064b0f0c72eea766d925340f1a7232cabcbd23d26773527c300b6d995bf5cde18a276208fdccc
-DIST patch-3.15.5.xz 122232 BLAKE2B 9c138316beea8ea04b704baca23621c76291064ac72a5eb107bcec4f371c2680471f96c678e269d04b03eaa857dc054ddd8057a06e5c7ac2b7ea8a303468139b SHA512 6831200503334e839c3cccdad29058aecc0205171cc5b75205d0a2aada8636633889ebff35d9677d4567bbaeea249efc83571e016104cd67554fe72b3b405755
-DIST patch-4.1.5.xz 170056 BLAKE2B 3beee64274154565bbe80389fe6258228f388ad5fa77a69e4d83906755c746bfd9d6052bf224d0f1bad33c4b656c1b6538345d05efd3e4f3953495241c05f0c8 SHA512 1325cdb35ea1f277d513932af37804f788b96ae63b94cedeb3c9b916ee8963bbd6aca5d0e13279e36a81f1de06005c5f3666ecfc845609932686f261fa4250c5
+DIST linux-4.20.tar.xz 104257836 BLAKE2B fb52cad2897da319299486fa8c3b9415cd0aee0842dbf353a5b269720dcb902db407bb55dd95a77b212dcb4a488c15363d561f3649d6bd16885561f2466d90b1 SHA512 e282399beea5da539701aed2bc131abd5bc74a970dcd344163e9d295106dfd700180e672ed546ae5e55bc6b9ac95efd5ca1de2039015c1b7a6fc9c01ea6583d4
DIST patch-4.14.33.xz 905284 BLAKE2B e67bd9a96708aaaf65eb0aa852493b2323c9e237bfcc6fa837f795e481943ead3e2d5005ee72e40fc247df01c50877d9da3848a05aba3c999c3cfb7678cbdbc9 SHA512 5c76be5171709c2df7df7d5a8e8f3d0f7ede47b433da3b0f1710f262c8fcf5cf6c744a96d4336ea397c2c88a5f0a7507a5ab08c7c82f08deeb7a6f887ad77cfd
-DIST patch-4.4.4.xz 200972 BLAKE2B 76f5505fae96c6ec21ef3480c54bd53d7021d9ec360527209dd16b069d5f7c65ab8f1e44aeeed49480cd7c2a685fd42852e062fff703a1d010cc487f55ec15fa SHA512 c206af7803cb0915fbe2bd27ed33282452db3fbd3070c73e4c7147443efd3c7588fb3be12d0abc08742381fbe892190602b29147684630aa9e6ff5e9efa49dbc
-DIST patch-4.9.13.xz 295932 BLAKE2B 37a90811dc1591d3f5d6609185ae518b02b36827c8557e400e7bb359ea04bf9cee66ea74fceaefb02c6e145ac34697efaecca6db071b35d6d872c9ac7c84b9ab SHA512 d7956cc8a4ab11514789af4f1f7023268e4b003216766c153f0f09aac659aabda5de634b363d53f8daeddfcf5820619c5bca31ff5f9aeb187c1df016c05f68d5
+DIST patch-4.20.3.xz 91732 BLAKE2B bf99271bcb35508df239343fd6c9d57c246f88320b586e44e2d97771d08b249a24db230214d4957015a5ed35261e201f0680101b99d0e92f0f1f69bc53e21458 SHA512 47178b8e3bfe4ba09cb82bb1ce8b0742e6749d4be3412fb57518918f7109e74eac1d3d8eb32a43e21b3837a14f37d5eefd8cab819defd10cc2db61fb0ceddeaf
diff --git a/dev-util/perf/metadata.xml b/dev-util/perf/metadata.xml
index abff870927b..8ec543d2535 100644
--- a/dev-util/perf/metadata.xml
+++ b/dev-util/perf/metadata.xml
@@ -9,6 +9,7 @@
<name>Yixun Lan</name>
</maintainer>
<use>
+ <flag name="clang">Enable builtin clang and LLVM support</flag>
<flag name="demangle">
Enable C++ symbol name demangling, using libbfd from
<pkg>sys-devel/binutils</pkg>. When this flag is enabled, the
@@ -26,6 +27,9 @@
<flag name="perl">
Add support for Perl as a scripting language for perf tools.
</flag>
+ <flag name="systemtap">
+ Add support to define SDT event in perf tools.
+ </flag>
<flag name="unwind">
Use sys-libs/libunwind for frame unwinding support.
</flag>
diff --git a/dev-util/perf/perf-3.12.ebuild b/dev-util/perf/perf-3.12.ebuild
deleted file mode 100644
index 9b930d58dec..00000000000
--- a/dev-util/perf/perf-3.12.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit versionator eutils toolchain-funcs python-single-r1 linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV/_rc} != ${PV} ]] ; then
- LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
- PATCH_VERSION=$(get_version_component_range 1-3)
- LINUX_PATCH=patch-${PV//_/-}.bz2
- SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
- mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ $(get_version_component_count) == 4 ]] ; then
- # stable-release series
- LINUX_VER=$(get_version_component_range 1-3)
- LINUX_PATCH=patch-${PV}.bz2
- SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
- LINUX_VER=${PV}
- SRC_URI=""
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.bz2"
-SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="audit +demangle +doc perl python slang unwind"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
- demangle? ( sys-devel/binutils )
- perl? ( dev-lang/perl )
- python? ( ${PYTHON_DEPS} )
- slang? ( dev-libs/newt )
- unwind? ( sys-libs/libunwind )
- dev-libs/elfutils"
-DEPEND="${RDEPEND}
- ${LINUX_PATCH+dev-util/patchutils}
- sys-devel/bison
- sys-devel/flex
- 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"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-pkg_setup() {
- linux-info_pkg_setup
- use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
- local paths=( tools/perf tools/scripts tools/lib include lib "arch/*/include" "arch/*/lib" )
-
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} > ${P}.patch || die
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- done
-}
-
-src_prepare() {
- if [[ -n ${LINUX_PATCH} ]] ; then
- cd "${S_K}"
- epatch "${WORKDIR}"/${P}.patch
- fi
-
- # Drop some upstream too-developer-oriented flags and fix the
- # Makefile in general
- sed -i \
- -e 's:-Werror::' \
- -e 's:-ggdb3::' \
- -e 's:-fstack-protector-all::' \
- -e 's:^LDFLAGS =:EXTLIBS +=:' \
- -e '/\(PERL\|PYTHON\)_EMBED_LDOPTS/s:ALL_LDFLAGS +=:EXTLIBS +=:' \
- -e '/-x c - /s:\$(ALL_LDFLAGS):\0 $(EXTLIBS):' \
- -e '/^ALL_CFLAGS =/s:$: $(CFLAGS_OPTIMIZE):' \
- -e '/^ALL_LDFLAGS =/s:$: $(LDFLAGS_OPTIMIZE):' \
- -e 's:$(sysconfdir_SQ)/bash_completion.d:/usr/share/bash-completion:' \
- "${S}"/Makefile || die
- sed -i -e 's:-Werror::' "${S_K}"/tools/lib/lk/Makefile || die
- sed -i \
- -e '/.FORCE-PERF-VERSION-FILE/s,.FORCE-PERF-VERSION-FILE,,g' \
- "${S}"/Makefile \
- "${S}"/Documentation/Makefile || die
-
- # Avoid the call to make kernelversion
- echo "#define PERF_VERSION \"${MY_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' {} +
-}
-
-puse() { usex $1 "" no; }
-perf_make() {
- # The arch parsing is a bit funky. The perf tools package is integrated
- # into the kernel, so it wants an ARCH that looks like the kernel arch,
- # but it also wants to know about the split value -- i386/x86_64 vs just
- # x86. We can get that by telling the func to use an older linux version.
- # It's kind of a hack, but not that bad ...
- local arch=$(KV=2.6.23 tc-arch-kernel)
- emake -j1 V=1 \
- CC="$(tc-getCC)" AR="$(tc-getAR)" \
- prefix="/usr" bindir_relative="sbin" \
- CFLAGS_OPTIMIZE="${CFLAGS}" \
- LDFLAGS_OPTIMIZE="${LDFLAGS}" \
- ARCH="${arch}" \
- NO_DEMANGLE=$(puse demangle) \
- NO_LIBAUDIT=$(puse audit) \
- NO_LIBPERL=$(puse perl) \
- NO_LIBPYTHON=$(puse python) \
- NO_LIBUNWIND=$(puse unwind) \
- NO_NEWT=$(puse slang) \
- WERROR=0 \
- "$@"
-}
-
-src_compile() {
- perf_make
- use doc && perf_make -C Documentation
-}
-
-src_test() {
- :
-}
-
-src_install() {
- perf_make install DESTDIR="${D}"
-
- dodoc CREDITS
-
- dodoc *txt Documentation/*.txt
- if use doc ; then
- dohtml Documentation/*.html
- doman Documentation/*.1
- fi
-}
-
-pkg_postinst() {
- if ! use doc ; then
- elog "Without the doc USE flag you won't get any documentation nor man pages."
- elog "And without man pages, you won't get any --help output for perf and its"
- elog "sub-tools."
- fi
-}
diff --git a/dev-util/perf/perf-3.13.1-r1.ebuild b/dev-util/perf/perf-3.13.1-r1.ebuild
deleted file mode 100644
index 39c962d6d05..00000000000
--- a/dev-util/perf/perf-3.13.1-r1.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit versionator eutils toolchain-funcs python-single-r1 linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
- LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
- PATCH_VERSION=$(get_version_component_range 1-3)
- LINUX_PATCH=patch-${PV//_/-}.xz
- SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
- mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-else
- VER_COUNT=$(get_version_component_count)
- if [[ ${VER_COUNT} -gt 2 ]] ; then
- # stable-release series
- LINUX_VER=$(get_version_component_range 1-2)
- LINUX_PATCH=patch-${PV}.xz
- SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
- else
- LINUX_VER=${PV}
- SRC_URI=""
- fi
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
-IUSE="audit +demangle +doc gtk perl python slang unwind"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
- demangle? ( sys-devel/binutils )
- gtk? ( x11-libs/gtk+:2 )
- perl? ( dev-lang/perl )
- python? ( ${PYTHON_DEPS} )
- slang? ( dev-libs/newt )
- unwind? ( sys-libs/libunwind )
- dev-libs/elfutils"
-DEPEND="${RDEPEND}
- ${LINUX_PATCH+dev-util/patchutils}
- sys-devel/bison
- sys-devel/flex
- 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"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-pkg_setup() {
- linux-info_pkg_setup
- use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
- local paths=( tools/perf tools/scripts tools/lib include lib "arch/*/include" "arch/*/lib" )
-
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} > ${P}.patch || die
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- done
-}
-
-src_prepare() {
- if [[ -n ${LINUX_PATCH} ]] ; then
- cd "${S_K}"
- epatch "${WORKDIR}"/${P}.patch
- fi
-
- # Drop some upstream too-developer-oriented flags and fix the
- # Makefile in general
- sed -i \
- -e 's:-Werror::' \
- -e 's:-ggdb3::' \
- -e 's:-fstack-protector-all::' \
- -e 's:^LDFLAGS =:EXTLIBS +=:' \
- -e '/\(PERL\|PYTHON\)_EMBED_LDOPTS/s:ALL_LDFLAGS +=:EXTLIBS +=:' \
- -e '/-x c - /s:\$(ALL_LDFLAGS):\0 $(EXTLIBS):' \
- -e '/^ALL_CFLAGS =/s:$: $(CFLAGS_OPTIMIZE):' \
- -e '/^ALL_LDFLAGS =/s:$: $(LDFLAGS_OPTIMIZE):' \
- -e 's:$(sysconfdir_SQ)/bash_completion.d:/usr/share/bash-completion:' \
- "${S}"/Makefile || die
- sed -i -e 's:-Werror::' "${S_K}"/tools/lib/lk/Makefile || die
- sed -i \
- -e '/.FORCE-PERF-VERSION-FILE/s,.FORCE-PERF-VERSION-FILE,,g' \
- "${S}"/Makefile \
- "${S}"/Documentation/Makefile || die
-
- # Avoid the call to make kernelversion
- echo "#define PERF_VERSION \"${MY_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' {} +
-}
-
-puse() { usex $1 "" no; }
-perf_make() {
- # The arch parsing is a bit funky. The perf tools package is integrated
- # into the kernel, so it wants an ARCH that looks like the kernel arch,
- # but it also wants to know about the split value -- i386/x86_64 vs just
- # x86. We can get that by telling the func to use an older linux version.
- # It's kind of a hack, but not that bad ...
- local arch=$(KV=2.6.23 tc-arch-kernel)
- emake V=1 \
- CC="$(tc-getCC)" AR="$(tc-getAR)" \
- prefix="/usr" bindir_relative="bin" \
- CFLAGS_OPTIMIZE="${CFLAGS}" \
- LDFLAGS_OPTIMIZE="${LDFLAGS}" \
- ARCH="${arch}" \
- NO_DEMANGLE=$(puse demangle) \
- NO_GTK2=$(puse gtk) \
- NO_LIBAUDIT=$(puse audit) \
- NO_LIBPERL=$(puse perl) \
- NO_LIBPYTHON=$(puse python) \
- NO_LIBUNWIND=$(puse unwind) \
- NO_NEWT=$(puse slang) \
- WERROR=0 \
- "$@"
-}
-
-src_compile() {
- perf_make -f Makefile.perf
- use doc && perf_make -C Documentation
-}
-
-src_test() {
- :
-}
-
-src_install() {
- perf_make -f Makefile.perf install DESTDIR="${D}"
-
- dodoc CREDITS
-
- dodoc *txt Documentation/*.txt
- if use doc ; then
- dohtml Documentation/*.html
- doman Documentation/*.1
- fi
-}
-
-pkg_postinst() {
- if ! use doc ; then
- elog "Without the doc USE flag you won't get any documentation nor man pages."
- elog "And without man pages, you won't get any --help output for perf and its"
- elog "sub-tools."
- fi
-}
diff --git a/dev-util/perf/perf-3.15.5.ebuild b/dev-util/perf/perf-3.15.5.ebuild
deleted file mode 100644
index c2e5a6f47f2..00000000000
--- a/dev-util/perf/perf-3.15.5.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit versionator eutils toolchain-funcs python-single-r1 linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
- LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
- PATCH_VERSION=$(get_version_component_range 1-3)
- LINUX_PATCH=patch-${PV//_/-}.xz
- SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
- mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-else
- VER_COUNT=$(get_version_component_count)
- if [[ ${VER_COUNT} -gt 2 ]] ; then
- # stable-release series
- LINUX_VER=$(get_version_component_range 1-2)
- LINUX_PATCH=patch-${PV}.xz
- SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
- else
- LINUX_VER=${PV}
- SRC_URI=""
- fi
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="audit debug +demangle +doc gtk perl python slang unwind"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
- demangle? ( sys-devel/binutils )
- gtk? ( x11-libs/gtk+:2 )
- perl? ( dev-lang/perl )
- python? ( ${PYTHON_DEPS} )
- slang? ( dev-libs/newt )
- unwind? ( sys-libs/libunwind )
- dev-libs/elfutils"
-DEPEND="${RDEPEND}
- ${LINUX_PATCH+dev-util/patchutils}
- sys-devel/bison
- sys-devel/flex
- 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"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-pkg_setup() {
- linux-info_pkg_setup
- use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
- local paths=( tools/perf tools/scripts tools/include tools/lib include lib "arch/*/include" "arch/*/lib" )
-
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} > ${P}.patch || die
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- done
-}
-
-src_prepare() {
- if [[ -n ${LINUX_PATCH} ]] ; then
- cd "${S_K}"
- epatch "${WORKDIR}"/${P}.patch
- fi
-
- # Drop some upstream too-developer-oriented flags and fix the
- # Makefile in general
- sed -i \
- -e 's:-Werror::' \
- -e 's:-ggdb3::' \
- -e 's:-fstack-protector-all::' \
- -e 's:^LDFLAGS =:EXTLIBS +=:' \
- -e '/\(PERL\|PYTHON\)_EMBED_LDOPTS/s:ALL_LDFLAGS +=:EXTLIBS +=:' \
- -e '/-x c - /s:\$(ALL_LDFLAGS):\0 $(EXTLIBS):' \
- -e '/^ALL_CFLAGS =/s:$: $(CFLAGS_OPTIMIZE):' \
- -e '/^ALL_LDFLAGS =/s:$: $(LDFLAGS_OPTIMIZE):' \
- -e 's:$(sysconfdir_SQ)/bash_completion.d:/usr/share/bash-completion:' \
- "${S}"/Makefile || die
- sed -i -e 's:-Werror::' "${S_K}"/tools/lib/api/Makefile || die
- sed -i \
- -e '/.FORCE-PERF-VERSION-FILE/s,.FORCE-PERF-VERSION-FILE,,g' \
- "${S}"/Makefile \
- "${S}"/Documentation/Makefile || die
-
- # Avoid the call to make kernelversion
- echo "#define PERF_VERSION \"${MY_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' {} +
-}
-
-puse() { usex $1 "" no; }
-perf_make() {
- # The arch parsing is a bit funky. The perf tools package is integrated
- # into the kernel, so it wants an ARCH that looks like the kernel arch,
- # but it also wants to know about the split value -- i386/x86_64 vs just
- # x86. We can get that by telling the func to use an older linux version.
- # It's kind of a hack, but not that bad ...
- local arch=$(KV=2.6.23 tc-arch-kernel)
- emake V=1 \
- CC="$(tc-getCC)" AR="$(tc-getAR)" \
- prefix="/usr" bindir_relative="bin" \
- CFLAGS_OPTIMIZE="${CFLAGS}" \
- LDFLAGS_OPTIMIZE="${LDFLAGS}" \
- ARCH="${arch}" \
- NO_DEMANGLE=$(puse demangle) \
- NO_GTK2=$(puse gtk) \
- NO_LIBAUDIT=$(puse audit) \
- NO_LIBPERL=$(puse perl) \
- NO_LIBPYTHON=$(puse python) \
- NO_LIBUNWIND=$(puse unwind) \
- NO_NEWT=$(puse slang) \
- WERROR=0 \
- "$@"
-}
-
-src_compile() {
- perf_make -f Makefile.perf
- use doc && perf_make -C Documentation
-}
-
-src_test() {
- :
-}
-
-src_install() {
- perf_make -f Makefile.perf install DESTDIR="${D}"
-
- dodoc CREDITS
-
- dodoc *txt Documentation/*.txt
- if use doc ; then
- dohtml Documentation/*.html
- doman Documentation/*.1
- fi
-}
-
-pkg_postinst() {
- if ! use doc ; then
- elog "Without the doc USE flag you won't get any documentation nor man pages."
- elog "And without man pages, you won't get any --help output for perf and its"
- elog "sub-tools."
- fi
-}
diff --git a/dev-util/perf/perf-4.1.5-r1.ebuild b/dev-util/perf/perf-4.1.5-r1.ebuild
deleted file mode 100644
index 4fdec292a19..00000000000
--- a/dev-util/perf/perf-4.1.5-r1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit versionator eutils toolchain-funcs python-single-r1 linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
- LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
- PATCH_VERSION=$(get_version_component_range 1-3)
- LINUX_PATCH=patch-${PV//_/-}.xz
- SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
- mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-else
- VER_COUNT=$(get_version_component_count)
- if [[ ${VER_COUNT} -gt 2 ]] ; then
- # stable-release series
- LINUX_VER=$(get_version_component_range 1-2)
- LINUX_PATCH=patch-${PV}.xz
- SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
- else
- LINUX_VER=${PV}
- SRC_URI=""
- fi
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
-IUSE="audit debug +demangle +doc gtk numa perl python slang unwind"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
- demangle? ( sys-devel/binutils:= )
- gtk? ( x11-libs/gtk+:2 )
- numa? ( sys-process/numactl )
- perl? ( dev-lang/perl )
- python? ( ${PYTHON_DEPS} )
- slang? ( dev-libs/newt )
- unwind? ( sys-libs/libunwind )
- dev-libs/elfutils"
-DEPEND="${RDEPEND}
- ${LINUX_PATCH+dev-util/patchutils}
- sys-devel/bison
- sys-devel/flex
- 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"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-pkg_setup() {
- linux-info_pkg_setup
- use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
- local paths=(
- tools/build tools/include tools/lib tools/perf tools/scripts
- include lib "arch/*/include" "arch/*/lib"
- )
-
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
- > ${P}.patch || die
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- done
-}
-
-src_prepare() {
- if [[ -n ${LINUX_PATCH} ]] ; then
- cd "${S_K}"
- epatch "${WORKDIR}"/${P}.patch
- fi
-
- epatch "${FILESDIR}"/${P}-prefix.patch
-
- # Drop some upstream too-developer-oriented flags and fix the
- # Makefile in general
- sed -i \
- -e 's:-Werror::' \
- -e 's:-ggdb3::' \
- -e 's:-fstack-protector-all::' \
- -e 's:^LDFLAGS =:EXTLIBS +=:' \
- -e '/\(PERL\|PYTHON\)_EMBED_LDOPTS/s:ALL_LDFLAGS +=:EXTLIBS +=:' \
- -e '/-x c - /s:\$(ALL_LDFLAGS):\0 $(EXTLIBS):' \
- -e '/^ALL_CFLAGS =/s:$: $(CFLAGS_OPTIMIZE):' \
- -e '/^ALL_LDFLAGS =/s:$: $(LDFLAGS_OPTIMIZE):' \
- -e 's:$(sysconfdir_SQ)/bash_completion.d:/usr/share/bash-completion:' \
- "${S}"/Makefile || die
- sed -i -e 's:-Werror::' "${S_K}"/tools/lib/api/Makefile || die
- sed -i \
- -e '/.FORCE-PERF-VERSION-FILE/s,.FORCE-PERF-VERSION-FILE,,g' \
- "${S}"/Makefile \
- "${S}"/Documentation/Makefile || die
-
- # Avoid the call to make kernelversion
- echo "#define PERF_VERSION \"${MY_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' {} +
-}
-
-puse() { usex $1 "" no; }
-perf_make() {
- # The arch parsing is a bit funky. The perf tools package is integrated
- # into the kernel, so it wants an ARCH that looks like the kernel arch,
- # but it also wants to know about the split value -- i386/x86_64 vs just
- # x86. We can get that by telling the func to use an older linux version.
- # It's kind of a hack, but not that bad ...
- local arch=$(tc-arch-kernel)
- emake V=1 \
- CC="$(tc-getCC)" AR="$(tc-getAR)" \
- prefix="/usr" bindir_relative="bin" \
- CFLAGS_OPTIMIZE="${CFLAGS}" \
- LDFLAGS_OPTIMIZE="${LDFLAGS}" \
- ARCH="${arch}" \
- NO_DEMANGLE=$(puse demangle) \
- NO_GTK2=$(puse gtk) \
- NO_LIBAUDIT=$(puse audit) \
- NO_LIBPERL=$(puse perl) \
- NO_LIBPYTHON=$(puse python) \
- NO_LIBUNWIND=$(puse unwind) \
- NO_NEWT=$(puse slang) \
- NO_LIBNUMA=$(puse numa) \
- WERROR=0 \
- "$@"
-}
-
-src_compile() {
- perf_make -f Makefile.perf
- use doc && perf_make -C Documentation
-}
-
-src_test() {
- :
-}
-
-src_install() {
- perf_make -f Makefile.perf install DESTDIR="${D}"
-
- dodoc CREDITS
-
- dodoc *txt Documentation/*.txt
- if use doc ; then
- dohtml Documentation/*.html
- doman Documentation/*.1
- fi
-}
-
-pkg_postinst() {
- if ! use doc ; then
- elog "Without the doc USE flag you won't get any documentation nor man pages."
- elog "And without man pages, you won't get any --help output for perf and its"
- elog "sub-tools."
- fi
-}
diff --git a/dev-util/perf/perf-4.9.13.ebuild b/dev-util/perf/perf-4.20.3.ebuild
similarity index 66%
rename from dev-util/perf/perf-4.9.13.ebuild
rename to dev-util/perf/perf-4.20.3.ebuild
index e9c0e8f0c42..5439d2b00ec 100644
--- a/dev-util/perf/perf-4.9.13.ebuild
+++ b/dev-util/perf/perf-4.20.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=7
PYTHON_COMPAT=( python2_7 )
-inherit bash-completion-r1 versionator eutils toolchain-funcs python-single-r1 linux-info
+inherit bash-completion-r1 estack eutils toolchain-funcs python-single-r1 linux-info
MY_PV="${PV/_/-}"
MY_PV="${MY_PV/-pre/-git}"
@@ -14,22 +14,19 @@ HOMEPAGE="https://perf.wiki.kernel.org/"
LINUX_V="${PV:0:1}.x"
if [[ ${PV} == *_rc* ]] ; then
- LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
- PATCH_VERSION=$(get_version_component_range 1-3)
+ LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+ PATCH_VERSION=$(ver_cut 1-3)
LINUX_PATCH=patch-${PV//_/-}.xz
SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ ${PV} == *.*.* ]] ; then
+ # stable-release series
+ LINUX_VER=$(ver_cut 1-2)
+ LINUX_PATCH=patch-${PV}.xz
+ SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
else
- VER_COUNT=$(get_version_component_count)
- if [[ ${VER_COUNT} -gt 2 ]] ; then
- # stable-release series
- LINUX_VER=$(get_version_component_range 1-2)
- LINUX_PATCH=patch-${PV}.xz
- SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
- else
- LINUX_VER=${PV}
- SRC_URI=""
- fi
+ LINUX_VER=${PV}
+ SRC_URI=""
fi
LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
@@ -37,24 +34,35 @@ SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit debug +demangle +doc gtk numa perl python slang unwind"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit clang crypt debug +demangle +doc gtk java lzma numa perl python slang systemtap unwind zlib"
+# TODO babeltrace
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="audit? ( sys-process/audit )
+ crypt? ( dev-libs/openssl:0= )
+ clang? (
+ sys-devel/clang:*
+ sys-devel/llvm:*
+ )
demangle? ( sys-libs/binutils-libs:= )
gtk? ( x11-libs/gtk+:2 )
+ java? ( virtual/jre:* )
+ lzma? ( app-arch/xz-utils )
numa? ( sys-process/numactl )
perl? ( dev-lang/perl )
python? ( ${PYTHON_DEPS} )
- slang? ( dev-libs/newt )
+ slang? ( sys-libs/slang )
+ systemtap? ( dev-util/systemtap )
unwind? ( sys-libs/libunwind )
+ zlib? ( sys-libs/zlib )
dev-libs/elfutils"
DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-4.9
+ >=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
@@ -88,7 +96,7 @@ src_unpack() {
eshopts_push -o noglob
ebegin "Filtering partial source patch"
filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
- > ${P}.patch || die
+ > ${P}.patch
eend $? || die "filterdiff failed"
eshopts_pop
fi
@@ -102,9 +110,10 @@ src_unpack() {
}
src_prepare() {
+ default
if [[ -n ${LINUX_PATCH} ]] ; then
cd "${S_K}"
- epatch "${WORKDIR}"/${P}.patch
+ eapply "${WORKDIR}"/${P}.patch
fi
# Drop some upstream too-developer-oriented flags and fix the
@@ -130,25 +139,54 @@ perf_make() {
# but it also wants to know about the split value -- i386/x86_64 vs just
# x86. We can get that by telling the func to use an older linux version.
# It's kind of a hack, but not that bad ...
+
+ # LIBDIR sets a search path of perf-gtk.so. Bug 515954
+
local arch=$(tc-arch-kernel)
- emake V=1 \
- CC="$(tc-getCC)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
+ local java_dir
+ use java && java_dir="/etc/java-config-2/current-system-vm"
+ # FIXME: NO_CORESIGHT
+ # FIXME: NO_LIBBABELTRACE
+ emake V=1 VF=1 \
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
prefix="${EPREFIX}/usr" bindir_relative="bin" \
EXTRA_CFLAGS="${CFLAGS}" \
ARCH="${arch}" \
+ JDIR="${java_dir}" \
+ LIBCLANGLLVM=$(usex clang 1 "") \
+ NO_AUXTRACE="" \
+ NO_BACKTRACE="" \
+ NO_CORESIGHT=1 \
NO_DEMANGLE=$(puse demangle) \
NO_GTK2=$(puse gtk) \
+ NO_JVMTI=$(puse java) \
NO_LIBAUDIT=$(puse audit) \
+ NO_LIBBABELTRACE=1 \
+ NO_LIBBIONIC=1 \
+ NO_LIBBPF="" \
+ NO_LIBCRYPTO=$(puse crypt) \
+ NO_LIBDW_DWARF_UNWIND="" \
+ NO_LIBELF="" \
+ NO_LIBNUMA=$(puse numa) \
NO_LIBPERL=$(puse perl) \
NO_LIBPYTHON=$(puse python) \
NO_LIBUNWIND=$(puse unwind) \
- NO_NEWT=$(puse slang) \
- NO_LIBNUMA=$(puse numa) \
+ NO_SDT=$(puse systemtap) \
+ NO_SLANG=$(puse slang) \
+ NO_LZMA=$(puse lzma) \
+ NO_ZLIB= \
WERROR=0 \
+ LIBDIR="/usr/libexec/perf-core" \
"$@"
}
src_compile() {
+ # test-clang.bin not build with g++
+ if use clang; then
+ pushd "${S_K}/tools/build/feature/" || die
+ make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
+ popd
+ fi
perf_make -f Makefile.perf
use doc && perf_make -C Documentation
}
@@ -160,11 +198,18 @@ src_test() {
src_install() {
perf_make -f Makefile.perf install DESTDIR="${D}"
+ rm -rv "${D}"/usr/share/doc/perf-tip || die
+
+ if use gtk; then
+ mv "${D}"/usr/$(get_libdir)/libperf-gtk.so \
+ "${D}"/usr/libexec/perf-core || die
+ fi
+
dodoc CREDITS
dodoc *txt Documentation/*.txt
if use doc ; then
- dohtml Documentation/*.html
+ HTML_DOCS="Documentation/*.html" einstalldocs
doman Documentation/*.1
fi
}
diff --git a/dev-util/perf/perf-4.4.4.ebuild b/dev-util/perf/perf-4.4.4.ebuild
deleted file mode 100644
index a1366ba16e6..00000000000
--- a/dev-util/perf/perf-4.4.4.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit versionator eutils toolchain-funcs python-single-r1 linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
- LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
- PATCH_VERSION=$(get_version_component_range 1-3)
- LINUX_PATCH=patch-${PV//_/-}.xz
- SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
- mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-else
- VER_COUNT=$(get_version_component_count)
- if [[ ${VER_COUNT} -gt 2 ]] ; then
- # stable-release series
- LINUX_VER=$(get_version_component_range 1-2)
- LINUX_PATCH=patch-${PV}.xz
- SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
- else
- LINUX_VER=${PV}
- SRC_URI=""
- fi
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="audit debug +demangle +doc gtk numa perl python slang unwind"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
- demangle? ( sys-devel/binutils:= )
- gtk? ( x11-libs/gtk+:2 )
- numa? ( sys-process/numactl )
- perl? ( dev-lang/perl )
- python? ( ${PYTHON_DEPS} )
- slang? ( dev-libs/newt )
- unwind? ( sys-libs/libunwind )
- dev-libs/elfutils"
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-4.4
- ${LINUX_PATCH+dev-util/patchutils}
- sys-devel/bison
- sys-devel/flex
- 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"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-pkg_setup() {
- linux-info_pkg_setup
- use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
- local paths=(
- tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
- include lib "arch/*/lib"
- )
-
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
- > ${P}.patch || die
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- done
-}
-
-src_prepare() {
- if [[ -n ${LINUX_PATCH} ]] ; then
- cd "${S_K}"
- epatch "${WORKDIR}"/${P}.patch
- fi
-
- # Drop some upstream too-developer-oriented flags and fix the
- # Makefile in general
- sed -i \
- -e 's:-Werror::' \
- -e 's:-ggdb3::' \
- -e 's:-fstack-protector-all::' \
- -e 's:^LDFLAGS =:EXTLIBS +=:' \
- -e '/\(PERL\|PYTHON\)_EMBED_LDOPTS/s:ALL_LDFLAGS +=:EXTLIBS +=:' \
- -e '/-x c - /s:\$(ALL_LDFLAGS):\0 $(EXTLIBS):' \
- "${S}"/config/Makefile || die
- sed -i \
- -e 's:$(sysconfdir_SQ)/bash_completion.d:/usr/share/bash-completion:' \
- "${S}"/Makefile.perf || die
- sed -i -e 's:-Werror::' "${S_K}"/tools/lib/api/Makefile || die
-
- # Avoid the call to make kernelversion
- echo "#define PERF_VERSION \"${MY_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' {} +
-}
-
-puse() { usex $1 "" no; }
-perf_make() {
- # The arch parsing is a bit funky. The perf tools package is integrated
- # into the kernel, so it wants an ARCH that looks like the kernel arch,
- # but it also wants to know about the split value -- i386/x86_64 vs just
- # x86. We can get that by telling the func to use an older linux version.
- # It's kind of a hack, but not that bad ...
- local arch=$(tc-arch-kernel)
- emake V=1 \
- CC="$(tc-getCC)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
- prefix="/usr" bindir_relative="bin" \
- EXTRA_CFLAGS="${CFLAGS}" \
- ARCH="${arch}" \
- NO_DEMANGLE=$(puse demangle) \
- NO_GTK2=$(puse gtk) \
- NO_LIBAUDIT=$(puse audit) \
- NO_LIBPERL=$(puse perl) \
- NO_LIBPYTHON=$(puse python) \
- NO_LIBUNWIND=$(puse unwind) \
- NO_NEWT=$(puse slang) \
- NO_LIBNUMA=$(puse numa) \
- WERROR=0 \
- "$@"
-}
-
-src_compile() {
- perf_make -f Makefile.perf
- use doc && perf_make -C Documentation
-}
-
-src_test() {
- :
-}
-
-src_install() {
- perf_make -f Makefile.perf install DESTDIR="${D}"
-
- dodoc CREDITS
-
- dodoc *txt Documentation/*.txt
- if use doc ; then
- dohtml Documentation/*.html
- doman Documentation/*.1
- fi
-}
-
-pkg_postinst() {
- if ! use doc ; then
- elog "Without the doc USE flag you won't get any documentation nor man pages."
- elog "And without man pages, you won't get any --help output for perf and its"
- elog "sub-tools."
- fi
-}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2019-08-07 14:51 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2019-08-07 14:51 UTC (permalink / raw
To: gentoo-commits
commit: f96b62c309fb60ff7df1122e01ba31726ecf349a
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 7 14:36:53 2019 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Wed Aug 7 14:48:48 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f96b62c3
dev-util/perf: fix ${D} vs ${ED} for prefix
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/perf-4.14.33-r1.ebuild | 4 ++--
dev-util/perf/perf-4.20.3.ebuild | 6 +++---
dev-util/perf/perf-5.1.15.ebuild | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dev-util/perf/perf-4.14.33-r1.ebuild b/dev-util/perf/perf-4.14.33-r1.ebuild
index 6eb3fa30238..62f2873092f 100644
--- a/dev-util/perf/perf-4.14.33-r1.ebuild
+++ b/dev-util/perf/perf-4.14.33-r1.ebuild
@@ -163,8 +163,8 @@ src_install() {
perf_make -f Makefile.perf install DESTDIR="${D}"
if use gtk; then
- mv "${D}"/usr/$(get_libdir)/libperf-gtk.so \
- "${D}"/usr/libexec/perf-core || die
+ mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
+ "${ED}"/usr/libexec/perf-core || die
fi
dodoc CREDITS
diff --git a/dev-util/perf/perf-4.20.3.ebuild b/dev-util/perf/perf-4.20.3.ebuild
index 5439d2b00ec..04e3df46fcb 100644
--- a/dev-util/perf/perf-4.20.3.ebuild
+++ b/dev-util/perf/perf-4.20.3.ebuild
@@ -198,11 +198,11 @@ src_test() {
src_install() {
perf_make -f Makefile.perf install DESTDIR="${D}"
- rm -rv "${D}"/usr/share/doc/perf-tip || die
+ rm -rv "${ED}"/usr/share/doc/perf-tip || die
if use gtk; then
- mv "${D}"/usr/$(get_libdir)/libperf-gtk.so \
- "${D}"/usr/libexec/perf-core || die
+ mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
+ "${ED}"/usr/libexec/perf-core || die
fi
dodoc CREDITS
diff --git a/dev-util/perf/perf-5.1.15.ebuild b/dev-util/perf/perf-5.1.15.ebuild
index 269c7c597ef..791892da875 100644
--- a/dev-util/perf/perf-5.1.15.ebuild
+++ b/dev-util/perf/perf-5.1.15.ebuild
@@ -212,11 +212,11 @@ src_test() {
src_install() {
perf_make -f Makefile.perf install DESTDIR="${D}"
- rm -rv "${D}"/usr/share/doc/perf-tip || die
+ rm -rv "${ED}"/usr/share/doc/perf-tip || die
if use gtk; then
- mv "${D}"/usr/$(get_libdir)/libperf-gtk.so \
- "${D}"/usr/libexec/perf-core || die
+ mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
+ "${ED}"/usr/libexec/perf-core || die
fi
dodoc CREDITS
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2019-10-20 1:06 Yixun Lan
0 siblings, 0 replies; 141+ messages in thread
From: Yixun Lan @ 2019-10-20 1:06 UTC (permalink / raw
To: gentoo-commits
commit: 2c95cc32aba0d7d6dd54a77146a6d147b711f67e
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 20 01:05:12 2019 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 01:05:33 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c95cc32
dev-util/perf: drop old & vulnerable versions
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
dev-util/perf/Manifest | 2 -
dev-util/perf/perf-4.14.33.ebuild | 179 ----------------------------
dev-util/perf/perf-5.1.15.ebuild | 237 --------------------------------------
3 files changed, 418 deletions(-)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 20db00b78b7..012d8331454 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,8 +1,6 @@
DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
DIST linux-4.20.tar.xz 104257836 BLAKE2B fb52cad2897da319299486fa8c3b9415cd0aee0842dbf353a5b269720dcb902db407bb55dd95a77b212dcb4a488c15363d561f3649d6bd16885561f2466d90b1 SHA512 e282399beea5da539701aed2bc131abd5bc74a970dcd344163e9d295106dfd700180e672ed546ae5e55bc6b9ac95efd5ca1de2039015c1b7a6fc9c01ea6583d4
-DIST linux-5.1.tar.xz 106244476 BLAKE2B ae3c63ced819737e34f8ec3a78138f87704a2f2956454411e3a4830ec8c0aaf2c288af6ca080f1892540e50f4a422482360010be8641afdeeeaf7231e7d8da97 SHA512 ae96f347badc95f1f3acf506c52b6cc23c0bd09ce8f4ce6705d4b4058b62593059bba1bc603c8d8b00a2f19131e7e56c31ac62b45883a346fa61d655e178f236
DIST linux-5.3.tar.xz 108558876 BLAKE2B 0d08eed879d05734e4542f0c93823d43f8dc042a54ba5268064c4bbebd7a9d59c03abf3ad5dee8280e784ae148a3b0c56181eaf2d5b3c079b6fe9f5191544df6 SHA512 6b5edef47c319a3fa7f6c20a3e0903a5acd89ec75e32dc5f99adcb60c9fe118ea312722d9c3d27e2e3900afa2455afb86e83a8b6bb131009bc79ddbe6fb0595d
DIST patch-4.14.33.xz 905284 BLAKE2B e67bd9a96708aaaf65eb0aa852493b2323c9e237bfcc6fa837f795e481943ead3e2d5005ee72e40fc247df01c50877d9da3848a05aba3c999c3cfb7678cbdbc9 SHA512 5c76be5171709c2df7df7d5a8e8f3d0f7ede47b433da3b0f1710f262c8fcf5cf6c744a96d4336ea397c2c88a5f0a7507a5ab08c7c82f08deeb7a6f887ad77cfd
DIST patch-4.20.3.xz 91732 BLAKE2B bf99271bcb35508df239343fd6c9d57c246f88320b586e44e2d97771d08b249a24db230214d4957015a5ed35261e201f0680101b99d0e92f0f1f69bc53e21458 SHA512 47178b8e3bfe4ba09cb82bb1ce8b0742e6749d4be3412fb57518918f7109e74eac1d3d8eb32a43e21b3837a14f37d5eefd8cab819defd10cc2db61fb0ceddeaf
-DIST patch-5.1.15.xz 426292 BLAKE2B 45a90fd8faafce8bb52273494adfb3b16f6e6c31fa8fba3fa89c71622db6a9db4868ca1a805cd32344cb72cf4cf0049af9215fceec5274c6796a91081db51b6f SHA512 0b2e4436644da2699cf6fdfb38d80dd7156fac74c1d99bec718f74171fb91815e3de1d08b892effc0ae39080c90b569a2bd30c1c4665c6b3a156cbb8e4c2ba61
DIST patch-5.3.7.xz 255616 BLAKE2B 18ec40508fdb2cc17dd927f3ddef07b2b744ff993de75bb7adebe3a3f97c9383ea1845085899aa939ca8a15515420c18a1ac0ae832f9ae52f18cc8ed59a1e75f SHA512 bf2717b721b3acfd423537a6a520388e6a596ae65605ed8c029a67c117a002e9a21c324de0dd41407bfdc8ef95263687764f4f46aa59cbb50f68ab21b96c29d6
diff --git a/dev-util/perf/perf-4.14.33.ebuild b/dev-util/perf/perf-4.14.33.ebuild
deleted file mode 100644
index 799478faa0b..00000000000
--- a/dev-util/perf/perf-4.14.33.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit bash-completion-r1 versionator eutils toolchain-funcs python-single-r1 linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
- LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
- PATCH_VERSION=$(get_version_component_range 1-3)
- LINUX_PATCH=patch-${PV//_/-}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
- https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-else
- VER_COUNT=$(get_version_component_count)
- if [[ ${VER_COUNT} -gt 2 ]] ; then
- # stable-release series
- LINUX_VER=$(get_version_component_range 1-2)
- LINUX_PATCH=patch-${PV}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
- else
- LINUX_VER=${PV}
- SRC_URI=""
- fi
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit debug +demangle +doc gtk numa perl python slang unwind"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
- demangle? ( sys-libs/binutils-libs:= )
- gtk? ( x11-libs/gtk+:2 )
- numa? ( sys-process/numactl )
- perl? ( dev-lang/perl )
- python? ( ${PYTHON_DEPS} )
- slang? ( dev-libs/newt )
- unwind? ( sys-libs/libunwind )
- dev-libs/elfutils"
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-4.9
- ${LINUX_PATCH+dev-util/patchutils}
- sys-devel/bison
- sys-devel/flex
- 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"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-pkg_setup() {
- linux-info_pkg_setup
- use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
- local paths=(
- tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
- include lib "arch/*/lib"
- )
-
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
- > ${P}.patch || die
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- done
-}
-
-src_prepare() {
- default
- if [[ -n ${LINUX_PATCH} ]] ; then
- cd "${S_K}"
- eapply "${WORKDIR}"/${P}.patch
- 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
- echo "#define PERF_VERSION \"${MY_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' {} +
-}
-
-puse() { usex $1 "" no; }
-perf_make() {
- # The arch parsing is a bit funky. The perf tools package is integrated
- # into the kernel, so it wants an ARCH that looks like the kernel arch,
- # but it also wants to know about the split value -- i386/x86_64 vs just
- # x86. We can get that by telling the func to use an older linux version.
- # It's kind of a hack, but not that bad ...
- local arch=$(tc-arch-kernel)
- emake V=1 \
- CC="$(tc-getCC)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
- prefix="${EPREFIX}/usr" bindir_relative="bin" \
- EXTRA_CFLAGS="${CFLAGS}" \
- ARCH="${arch}" \
- NO_DEMANGLE=$(puse demangle) \
- NO_GTK2=$(puse gtk) \
- NO_LIBAUDIT=$(puse audit) \
- NO_LIBPERL=$(puse perl) \
- NO_LIBPYTHON=$(puse python) \
- NO_LIBUNWIND=$(puse unwind) \
- NO_NEWT=$(puse slang) \
- NO_LIBNUMA=$(puse numa) \
- WERROR=0 \
- "$@"
-}
-
-src_compile() {
- perf_make -f Makefile.perf
- use doc && perf_make -C Documentation
-}
-
-src_test() {
- :
-}
-
-src_install() {
- perf_make -f Makefile.perf install DESTDIR="${D}"
-
- dodoc CREDITS
-
- dodoc *txt Documentation/*.txt
- if use doc ; then
- HTML_DOCS="Documentation/*.html" einstalldocs
- doman Documentation/*.1
- fi
-}
-
-pkg_postinst() {
- if ! use doc ; then
- elog "Without the doc USE flag you won't get any documentation nor man pages."
- elog "And without man pages, you won't get any --help output for perf and its"
- elog "sub-tools."
- fi
-}
diff --git a/dev-util/perf/perf-5.1.15.ebuild b/dev-util/perf/perf-5.1.15.ebuild
deleted file mode 100644
index 22d9957a254..00000000000
--- a/dev-util/perf/perf-5.1.15.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit bash-completion-r1 estack eutils toolchain-funcs python-single-r1 linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
- LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
- PATCH_VERSION=$(ver_cut 1-3)
- LINUX_PATCH=patch-${PV//_/-}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
- https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ ${PV} == *.*.* ]] ; then
- # stable-release series
- LINUX_VER=$(ver_cut 1-2)
- LINUX_PATCH=patch-${PV}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
- LINUX_VER=${PV}
- SRC_URI=""
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit clang crypt debug +demangle +doc gtk java lzma numa perl python slang systemtap unwind zlib"
-# TODO babeltrace
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
- crypt? ( dev-libs/openssl:0= )
- clang? (
- sys-devel/clang:*
- sys-devel/llvm:*
- )
- demangle? ( sys-libs/binutils-libs:= )
- gtk? ( x11-libs/gtk+:2 )
- java? ( virtual/jre:* )
- lzma? ( app-arch/xz-utils )
- numa? ( sys-process/numactl )
- perl? ( dev-lang/perl )
- python? ( ${PYTHON_DEPS} )
- slang? ( sys-libs/slang )
- systemtap? ( dev-util/systemtap )
- 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"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-pkg_setup() {
- linux-info_pkg_setup
- use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
- local paths=(
- tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
- include lib "arch/*/lib"
- )
-
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
- > ${P}.patch
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- done
-
- # support clang8
- echo $(clang-major-version)
- if use clang; then
- local old_CC=${CC}
- CC=${CHOST}-clang
- if [[ $(clang-major-version) -ge 8 ]]; then
- pushd "${S_K}" >/dev/null || die
- eapply "${FILESDIR}/perf-5.1.15-fix-clang8.patch"
- popd || die
- fi
- CC=${old_CC}
- fi
-}
-
-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
- echo "#define PERF_VERSION \"${MY_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' {} +
-}
-
-puse() { usex $1 "" no; }
-perf_make() {
- # The arch parsing is a bit funky. The perf tools package is integrated
- # into the kernel, so it wants an ARCH that looks like the kernel arch,
- # but it also wants to know about the split value -- i386/x86_64 vs just
- # x86. We can get that by telling the func to use an older linux version.
- # It's kind of a hack, but not that bad ...
-
- # LIBDIR sets a search path of perf-gtk.so. Bug 515954
-
- local arch=$(tc-arch-kernel)
- local java_dir
- use java && java_dir="/etc/java-config-2/current-system-vm"
- # FIXME: NO_CORESIGHT
- # FIXME: NO_LIBBABELTRACE
- emake V=1 VF=1 \
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
- prefix="${EPREFIX}/usr" bindir_relative="bin" \
- EXTRA_CFLAGS="${CFLAGS}" \
- ARCH="${arch}" \
- JDIR="${java_dir}" \
- LIBCLANGLLVM=$(usex clang 1 "") \
- NO_AUXTRACE="" \
- NO_BACKTRACE="" \
- NO_CORESIGHT=1 \
- NO_DEMANGLE=$(puse demangle) \
- NO_GTK2=$(puse gtk) \
- NO_JVMTI=$(puse java) \
- NO_LIBAUDIT=$(puse audit) \
- NO_LIBBABELTRACE=1 \
- NO_LIBBIONIC=1 \
- NO_LIBBPF="" \
- NO_LIBCRYPTO=$(puse crypt) \
- NO_LIBDW_DWARF_UNWIND="" \
- NO_LIBELF="" \
- NO_LIBNUMA=$(puse numa) \
- NO_LIBPERL=$(puse perl) \
- NO_LIBPYTHON=$(puse python) \
- NO_LIBUNWIND=$(puse unwind) \
- NO_SDT=$(puse systemtap) \
- NO_SLANG=$(puse slang) \
- NO_LZMA=$(puse lzma) \
- NO_ZLIB= \
- WERROR=0 \
- LIBDIR="/usr/libexec/perf-core" \
- "$@"
-}
-
-src_compile() {
- # test-clang.bin not build with g++
- if use clang; then
- pushd "${S_K}/tools/build/feature/" || die
- make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
- popd
- fi
- perf_make -f Makefile.perf
- use doc && perf_make -C Documentation
-}
-
-src_test() {
- :
-}
-
-src_install() {
- perf_make -f Makefile.perf install DESTDIR="${D}"
-
- rm -rv "${ED}"/usr/share/doc/perf-tip || die
-
- if use gtk; then
- mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
- "${ED}"/usr/libexec/perf-core || die
- fi
-
- dodoc CREDITS
-
- dodoc *txt Documentation/*.txt
- if use doc ; then
- HTML_DOCS="Documentation/*.html" einstalldocs
- doman Documentation/*.1
- fi
-}
-
-pkg_postinst() {
- if ! use doc ; then
- elog "Without the doc USE flag you won't get any documentation nor man pages."
- elog "And without man pages, you won't get any --help output for perf and its"
- elog "sub-tools."
- fi
-}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2019-10-20 1:06 Yixun Lan
0 siblings, 0 replies; 141+ messages in thread
From: Yixun Lan @ 2019-10-20 1:06 UTC (permalink / raw
To: gentoo-commits
commit: 9b7b82cfc2de8497b8ac63aead8011a691fd84b1
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 20 01:03:03 2019 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 01:03:03 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b7b82cf
dev-util/perf: version bump, 5.3.7
Fix crashes on certain AMD hardware with version 5.1
More bug info can be found at [1], and here is fix [2]
Thanks Layton Kifer for reporting.
[1] https://bugzilla.kernel.org/show_bug.cgi?id=203811
[2] upstream kernel commit: cd136189370cc8a5aec0ea4b4ec517e5ee38d8a0
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
dev-util/perf/Manifest | 2 +
dev-util/perf/perf-5.3.7.ebuild | 237 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 239 insertions(+)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 6e7fe4cc0f3..20db00b78b7 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,6 +1,8 @@
DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
DIST linux-4.20.tar.xz 104257836 BLAKE2B fb52cad2897da319299486fa8c3b9415cd0aee0842dbf353a5b269720dcb902db407bb55dd95a77b212dcb4a488c15363d561f3649d6bd16885561f2466d90b1 SHA512 e282399beea5da539701aed2bc131abd5bc74a970dcd344163e9d295106dfd700180e672ed546ae5e55bc6b9ac95efd5ca1de2039015c1b7a6fc9c01ea6583d4
DIST linux-5.1.tar.xz 106244476 BLAKE2B ae3c63ced819737e34f8ec3a78138f87704a2f2956454411e3a4830ec8c0aaf2c288af6ca080f1892540e50f4a422482360010be8641afdeeeaf7231e7d8da97 SHA512 ae96f347badc95f1f3acf506c52b6cc23c0bd09ce8f4ce6705d4b4058b62593059bba1bc603c8d8b00a2f19131e7e56c31ac62b45883a346fa61d655e178f236
+DIST linux-5.3.tar.xz 108558876 BLAKE2B 0d08eed879d05734e4542f0c93823d43f8dc042a54ba5268064c4bbebd7a9d59c03abf3ad5dee8280e784ae148a3b0c56181eaf2d5b3c079b6fe9f5191544df6 SHA512 6b5edef47c319a3fa7f6c20a3e0903a5acd89ec75e32dc5f99adcb60c9fe118ea312722d9c3d27e2e3900afa2455afb86e83a8b6bb131009bc79ddbe6fb0595d
DIST patch-4.14.33.xz 905284 BLAKE2B e67bd9a96708aaaf65eb0aa852493b2323c9e237bfcc6fa837f795e481943ead3e2d5005ee72e40fc247df01c50877d9da3848a05aba3c999c3cfb7678cbdbc9 SHA512 5c76be5171709c2df7df7d5a8e8f3d0f7ede47b433da3b0f1710f262c8fcf5cf6c744a96d4336ea397c2c88a5f0a7507a5ab08c7c82f08deeb7a6f887ad77cfd
DIST patch-4.20.3.xz 91732 BLAKE2B bf99271bcb35508df239343fd6c9d57c246f88320b586e44e2d97771d08b249a24db230214d4957015a5ed35261e201f0680101b99d0e92f0f1f69bc53e21458 SHA512 47178b8e3bfe4ba09cb82bb1ce8b0742e6749d4be3412fb57518918f7109e74eac1d3d8eb32a43e21b3837a14f37d5eefd8cab819defd10cc2db61fb0ceddeaf
DIST patch-5.1.15.xz 426292 BLAKE2B 45a90fd8faafce8bb52273494adfb3b16f6e6c31fa8fba3fa89c71622db6a9db4868ca1a805cd32344cb72cf4cf0049af9215fceec5274c6796a91081db51b6f SHA512 0b2e4436644da2699cf6fdfb38d80dd7156fac74c1d99bec718f74171fb91815e3de1d08b892effc0ae39080c90b569a2bd30c1c4665c6b3a156cbb8e4c2ba61
+DIST patch-5.3.7.xz 255616 BLAKE2B 18ec40508fdb2cc17dd927f3ddef07b2b744ff993de75bb7adebe3a3f97c9383ea1845085899aa939ca8a15515420c18a1ac0ae832f9ae52f18cc8ed59a1e75f SHA512 bf2717b721b3acfd423537a6a520388e6a596ae65605ed8c029a67c117a002e9a21c324de0dd41407bfdc8ef95263687764f4f46aa59cbb50f68ab21b96c29d6
diff --git a/dev-util/perf/perf-5.3.7.ebuild b/dev-util/perf/perf-5.3.7.ebuild
new file mode 100644
index 00000000000..22d9957a254
--- /dev/null
+++ b/dev-util/perf/perf-5.3.7.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit bash-completion-r1 estack eutils toolchain-funcs python-single-r1 linux-info
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+ LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+ PATCH_VERSION=$(ver_cut 1-3)
+ LINUX_PATCH=patch-${PV//_/-}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+ https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ ${PV} == *.*.* ]] ; then
+ # stable-release series
+ LINUX_VER=$(ver_cut 1-2)
+ LINUX_PATCH=patch-${PV}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+ LINUX_VER=${PV}
+ SRC_URI=""
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit clang crypt debug +demangle +doc gtk java lzma numa perl python slang systemtap unwind zlib"
+# TODO babeltrace
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="audit? ( sys-process/audit )
+ crypt? ( dev-libs/openssl:0= )
+ clang? (
+ sys-devel/clang:*
+ sys-devel/llvm:*
+ )
+ demangle? ( sys-libs/binutils-libs:= )
+ gtk? ( x11-libs/gtk+:2 )
+ java? ( virtual/jre:* )
+ lzma? ( app-arch/xz-utils )
+ numa? ( sys-process/numactl )
+ perl? ( dev-lang/perl )
+ python? ( ${PYTHON_DEPS} )
+ slang? ( sys-libs/slang )
+ systemtap? ( dev-util/systemtap )
+ 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"
+
+CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+
+pkg_setup() {
+ linux-info_pkg_setup
+ use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+ local paths=(
+ tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
+ include lib "arch/*/lib"
+ )
+
+ # We expect the tar implementation to support the -j option (both
+ # GNU tar and libarchive's tar support that).
+ echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+ tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+ "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ eshopts_push -o noglob
+ ebegin "Filtering partial source patch"
+ filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+ > ${P}.patch
+ eend $? || die "filterdiff failed"
+ eshopts_pop
+ fi
+
+ local a
+ for a in ${A}; do
+ [[ ${a} == ${LINUX_SOURCES} ]] && continue
+ [[ ${a} == ${LINUX_PATCH} ]] && continue
+ unpack ${a}
+ done
+
+ # support clang8
+ echo $(clang-major-version)
+ if use clang; then
+ local old_CC=${CC}
+ CC=${CHOST}-clang
+ if [[ $(clang-major-version) -ge 8 ]]; then
+ pushd "${S_K}" >/dev/null || die
+ eapply "${FILESDIR}/perf-5.1.15-fix-clang8.patch"
+ popd || die
+ fi
+ CC=${old_CC}
+ fi
+}
+
+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
+ echo "#define PERF_VERSION \"${MY_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' {} +
+}
+
+puse() { usex $1 "" no; }
+perf_make() {
+ # The arch parsing is a bit funky. The perf tools package is integrated
+ # into the kernel, so it wants an ARCH that looks like the kernel arch,
+ # but it also wants to know about the split value -- i386/x86_64 vs just
+ # x86. We can get that by telling the func to use an older linux version.
+ # It's kind of a hack, but not that bad ...
+
+ # LIBDIR sets a search path of perf-gtk.so. Bug 515954
+
+ local arch=$(tc-arch-kernel)
+ local java_dir
+ use java && java_dir="/etc/java-config-2/current-system-vm"
+ # FIXME: NO_CORESIGHT
+ # FIXME: NO_LIBBABELTRACE
+ emake V=1 VF=1 \
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
+ prefix="${EPREFIX}/usr" bindir_relative="bin" \
+ EXTRA_CFLAGS="${CFLAGS}" \
+ ARCH="${arch}" \
+ JDIR="${java_dir}" \
+ LIBCLANGLLVM=$(usex clang 1 "") \
+ NO_AUXTRACE="" \
+ NO_BACKTRACE="" \
+ NO_CORESIGHT=1 \
+ NO_DEMANGLE=$(puse demangle) \
+ NO_GTK2=$(puse gtk) \
+ NO_JVMTI=$(puse java) \
+ NO_LIBAUDIT=$(puse audit) \
+ NO_LIBBABELTRACE=1 \
+ NO_LIBBIONIC=1 \
+ NO_LIBBPF="" \
+ NO_LIBCRYPTO=$(puse crypt) \
+ NO_LIBDW_DWARF_UNWIND="" \
+ NO_LIBELF="" \
+ NO_LIBNUMA=$(puse numa) \
+ NO_LIBPERL=$(puse perl) \
+ NO_LIBPYTHON=$(puse python) \
+ NO_LIBUNWIND=$(puse unwind) \
+ NO_SDT=$(puse systemtap) \
+ NO_SLANG=$(puse slang) \
+ NO_LZMA=$(puse lzma) \
+ NO_ZLIB= \
+ WERROR=0 \
+ LIBDIR="/usr/libexec/perf-core" \
+ "$@"
+}
+
+src_compile() {
+ # test-clang.bin not build with g++
+ if use clang; then
+ pushd "${S_K}/tools/build/feature/" || die
+ make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
+ popd
+ fi
+ perf_make -f Makefile.perf
+ use doc && perf_make -C Documentation
+}
+
+src_test() {
+ :
+}
+
+src_install() {
+ perf_make -f Makefile.perf install DESTDIR="${D}"
+
+ rm -rv "${ED}"/usr/share/doc/perf-tip || die
+
+ if use gtk; then
+ mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
+ "${ED}"/usr/libexec/perf-core || die
+ fi
+
+ dodoc CREDITS
+
+ dodoc *txt Documentation/*.txt
+ if use doc ; then
+ HTML_DOCS="Documentation/*.html" einstalldocs
+ doman Documentation/*.1
+ fi
+}
+
+pkg_postinst() {
+ if ! use doc ; then
+ elog "Without the doc USE flag you won't get any documentation nor man pages."
+ elog "And without man pages, you won't get any --help output for perf and its"
+ elog "sub-tools."
+ fi
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2019-11-08 13:47 Andreas K. Hüttel
0 siblings, 0 replies; 141+ messages in thread
From: Andreas K. Hüttel @ 2019-11-08 13:47 UTC (permalink / raw
To: gentoo-commits
commit: 50fbf6313300c11180a20da747a564bc3f505955
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 8 13:47:02 2019 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Nov 8 13:47:02 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50fbf631
dev-util/perf: Needs slot op on perl, bug 617972
Bug: https://bugs.gentoo.org/617972
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
dev-util/perf/perf-4.14.33-r1.ebuild | 4 ++--
dev-util/perf/perf-4.20.3.ebuild | 2 +-
dev-util/perf/perf-5.3.7.ebuild | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-util/perf/perf-4.14.33-r1.ebuild b/dev-util/perf/perf-4.14.33-r1.ebuild
index 8c80e235b46..a56ee6109a4 100644
--- a/dev-util/perf/perf-4.14.33-r1.ebuild
+++ b/dev-util/perf/perf-4.14.33-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -42,7 +42,7 @@ RDEPEND="audit? ( sys-process/audit )
demangle? ( sys-libs/binutils-libs:= )
gtk? ( x11-libs/gtk+:2 )
numa? ( sys-process/numactl )
- perl? ( dev-lang/perl )
+ perl? ( dev-lang/perl:= )
python? ( ${PYTHON_DEPS} )
slang? ( dev-libs/newt )
unwind? ( sys-libs/libunwind )
diff --git a/dev-util/perf/perf-4.20.3.ebuild b/dev-util/perf/perf-4.20.3.ebuild
index 1cf8fe37964..a366266a3ad 100644
--- a/dev-util/perf/perf-4.20.3.ebuild
+++ b/dev-util/perf/perf-4.20.3.ebuild
@@ -50,7 +50,7 @@ RDEPEND="audit? ( sys-process/audit )
java? ( virtual/jre:* )
lzma? ( app-arch/xz-utils )
numa? ( sys-process/numactl )
- perl? ( dev-lang/perl )
+ perl? ( dev-lang/perl:= )
python? ( ${PYTHON_DEPS} )
slang? ( sys-libs/slang )
systemtap? ( dev-util/systemtap )
diff --git a/dev-util/perf/perf-5.3.7.ebuild b/dev-util/perf/perf-5.3.7.ebuild
index 22d9957a254..dbfe8de5c4b 100644
--- a/dev-util/perf/perf-5.3.7.ebuild
+++ b/dev-util/perf/perf-5.3.7.ebuild
@@ -50,7 +50,7 @@ RDEPEND="audit? ( sys-process/audit )
java? ( virtual/jre:* )
lzma? ( app-arch/xz-utils )
numa? ( sys-process/numactl )
- perl? ( dev-lang/perl )
+ perl? ( dev-lang/perl:= )
python? ( ${PYTHON_DEPS} )
slang? ( sys-libs/slang )
systemtap? ( dev-util/systemtap )
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2019-12-29 23:31 Mike Gilbert
0 siblings, 0 replies; 141+ messages in thread
From: Mike Gilbert @ 2019-12-29 23:31 UTC (permalink / raw
To: gentoo-commits
commit: 2d793234f4b8caf46f62f51fa7e4eec5f6430b7b
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 29 23:31:30 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 23:31:50 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d793234
dev-util/perf: fix install with python disabled
Closes: https://bugs.gentoo.org/703938
Package-Manager: Portage-2.3.82, Repoman-2.3.20_p9
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-util/perf/perf-5.4.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-5.4.6.ebuild b/dev-util/perf/perf-5.4.6.ebuild
index 8fb6d466869..caa91f6849d 100644
--- a/dev-util/perf/perf-5.4.6.ebuild
+++ b/dev-util/perf/perf-5.4.6.ebuild
@@ -217,7 +217,7 @@ src_install() {
}
perf_make -f Makefile.perf install DESTDIR="${D}"
- if python; then
+ if use python; then
python_foreach_impl _install_python_ext
fi
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2020-01-04 21:41 Naohiro Aota
0 siblings, 0 replies; 141+ messages in thread
From: Naohiro Aota @ 2020-01-04 21:41 UTC (permalink / raw
To: gentoo-commits
commit: c6f66627b9238efbddc623de273ab1d5bf4874cd
Author: Naohiro Aota <naota <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 4 21:17:53 2020 +0000
Commit: Naohiro Aota <naota <AT> gentoo <DOT> org>
CommitDate: Sat Jan 4 21:40:14 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6f66627
dev-util/perf: fix build with -Werror
Apply an upstream patch to fix the issue.
Closes: https://bugs.gentoo.org/704254
Signed-off-by: Naohiro Aota <naota <AT> gentoo.org>
dev-util/perf/Manifest | 2 +-
dev-util/perf/{perf-5.4.6.ebuild => perf-5.4.7.ebuild} | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 14e8bf98547..11d1946d67e 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -5,4 +5,4 @@ DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6
DIST patch-4.14.33.xz 905284 BLAKE2B e67bd9a96708aaaf65eb0aa852493b2323c9e237bfcc6fa837f795e481943ead3e2d5005ee72e40fc247df01c50877d9da3848a05aba3c999c3cfb7678cbdbc9 SHA512 5c76be5171709c2df7df7d5a8e8f3d0f7ede47b433da3b0f1710f262c8fcf5cf6c744a96d4336ea397c2c88a5f0a7507a5ab08c7c82f08deeb7a6f887ad77cfd
DIST patch-4.20.3.xz 91732 BLAKE2B bf99271bcb35508df239343fd6c9d57c246f88320b586e44e2d97771d08b249a24db230214d4957015a5ed35261e201f0680101b99d0e92f0f1f69bc53e21458 SHA512 47178b8e3bfe4ba09cb82bb1ce8b0742e6749d4be3412fb57518918f7109e74eac1d3d8eb32a43e21b3837a14f37d5eefd8cab819defd10cc2db61fb0ceddeaf
DIST patch-5.3.7.xz 255616 BLAKE2B 18ec40508fdb2cc17dd927f3ddef07b2b744ff993de75bb7adebe3a3f97c9383ea1845085899aa939ca8a15515420c18a1ac0ae832f9ae52f18cc8ed59a1e75f SHA512 bf2717b721b3acfd423537a6a520388e6a596ae65605ed8c029a67c117a002e9a21c324de0dd41407bfdc8ef95263687764f4f46aa59cbb50f68ab21b96c29d6
-DIST patch-5.4.6.xz 167272 BLAKE2B 43d7b0b7ee412f68eceb3be32d2629d1a5effef127b3351a499463a740809bdd7274c1ec409bbd77b203b2e4ef117c5c390b4d4b6a440385ab91ee9dcac74926 SHA512 6f6d73c7ce71d47e810847149f4c258f5fb99c98fc67d385a3ff74889543a415bf8bb77c748a13f72b733bca770773731d84713a9be98d630b7377a792f11f5a
+DIST patch-5.4.7.xz 272092 BLAKE2B dc9e1cede993144a4d9cb17cb91d3857b6492fa1a971c743268afdc601edfafb033abc3ac24cb7789d3f171ea7fb6b60ad5197da445ab72f5e9cf2ae00e7f495 SHA512 396eaf9fe88045e6e308cbe8e72217b3334b637bfa7e85f8d27cc4dd8e3d94c6f58d2b7b3e237defcf647d500610b85780ec2e21f1d91ac41c5f4ef3e74dc161
diff --git a/dev-util/perf/perf-5.4.6.ebuild b/dev-util/perf/perf-5.4.7.ebuild
similarity index 98%
rename from dev-util/perf/perf-5.4.6.ebuild
rename to dev-util/perf/perf-5.4.7.ebuild
index caa91f6849d..13741eb76f6 100644
--- a/dev-util/perf/perf-5.4.6.ebuild
+++ b/dev-util/perf/perf-5.4.7.ebuild
@@ -122,6 +122,10 @@ src_unpack() {
fi
CC=${old_CC}
fi
+
+ pushd "${S_K}" >/dev/null || die
+ eapply "${FILESDIR}/perf-5.4.7-propagate-cflags.patch"
+ popd || die
}
src_prepare() {
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2020-01-05 22:17 Sven Wegener
0 siblings, 0 replies; 141+ messages in thread
From: Sven Wegener @ 2020-01-05 22:17 UTC (permalink / raw
To: gentoo-commits
commit: 8152e5bee1c19efe91b1ca5e7be6bb409ec23544
Author: Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 5 22:16:56 2020 +0000
Commit: Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Sun Jan 5 22:17:38 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8152e5be
dev-util/perf: Remove non-existing python-r1_pkg_setup
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>
dev-util/perf/perf-5.4.7.ebuild | 5 -----
1 file changed, 5 deletions(-)
diff --git a/dev-util/perf/perf-5.4.7.ebuild b/dev-util/perf/perf-5.4.7.ebuild
index 56a4cf7bdc1..bec92bb4af8 100644
--- a/dev-util/perf/perf-5.4.7.ebuild
+++ b/dev-util/perf/perf-5.4.7.ebuild
@@ -75,11 +75,6 @@ S="${S_K}/tools/perf"
CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-pkg_setup() {
- linux-info_pkg_setup
- use python && python-r1_pkg_setup
-}
-
src_unpack() {
local paths=(
tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2020-02-12 21:04 David Seifert
0 siblings, 0 replies; 141+ messages in thread
From: David Seifert @ 2020-02-12 21:04 UTC (permalink / raw
To: gentoo-commits
commit: ed7eba5b4740d23f47fcb6a827d67c43bfb9cf94
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 21:03:30 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 21:03:30 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed7eba5b
dev-util/perf: [QA] inherit estack.eclass directly
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
dev-util/perf/perf-4.14.33-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-util/perf/perf-4.14.33-r1.ebuild b/dev-util/perf/perf-4.14.33-r1.ebuild
index a56ee6109a4..34c62791ba6 100644
--- a/dev-util/perf/perf-4.14.33-r1.ebuild
+++ b/dev-util/perf/perf-4.14.33-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python2_7 )
-inherit bash-completion-r1 eutils toolchain-funcs python-single-r1 linux-info
+inherit bash-completion-r1 estack eutils toolchain-funcs python-single-r1 linux-info
MY_PV="${PV/_/-}"
MY_PV="${MY_PV/-pre/-git}"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2020-02-15 16:05 Yixun Lan
0 siblings, 0 replies; 141+ messages in thread
From: Yixun Lan @ 2020-02-15 16:05 UTC (permalink / raw
To: gentoo-commits
commit: 3a2ac76b322629254386cc09adab087a8aa74f24
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 15 16:03:36 2020 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Sat Feb 15 16:04:27 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a2ac76b
dev-util/perf: drop old version
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
dev-util/perf/Manifest | 1 -
dev-util/perf/perf-5.4.7.ebuild | 245 ----------------------------------------
2 files changed, 246 deletions(-)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 38f95eb78e3..2014946c1b6 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -6,4 +6,3 @@ DIST patch-4.14.33.xz 905284 BLAKE2B e67bd9a96708aaaf65eb0aa852493b2323c9e237bfc
DIST patch-4.20.3.xz 91732 BLAKE2B bf99271bcb35508df239343fd6c9d57c246f88320b586e44e2d97771d08b249a24db230214d4957015a5ed35261e201f0680101b99d0e92f0f1f69bc53e21458 SHA512 47178b8e3bfe4ba09cb82bb1ce8b0742e6749d4be3412fb57518918f7109e74eac1d3d8eb32a43e21b3837a14f37d5eefd8cab819defd10cc2db61fb0ceddeaf
DIST patch-5.3.7.xz 255616 BLAKE2B 18ec40508fdb2cc17dd927f3ddef07b2b744ff993de75bb7adebe3a3f97c9383ea1845085899aa939ca8a15515420c18a1ac0ae832f9ae52f18cc8ed59a1e75f SHA512 bf2717b721b3acfd423537a6a520388e6a596ae65605ed8c029a67c117a002e9a21c324de0dd41407bfdc8ef95263687764f4f46aa59cbb50f68ab21b96c29d6
DIST patch-5.4.20.xz 776552 BLAKE2B bad2a95ed8521ac5c379fe91e16d60b2a38de19b9239755084621e5230677b232ec4cf9e2e8161c0022daff43fdbb37d5b5b5bfdc9e932ef3a860bcd17f640f8 SHA512 65fbcdbd41e35c17601ff15bbe33933be2ab7a694aa181a0b802cc11c1c653c9b688dbb382076cbad05983a0c07467955c035ae25f5175f7ce5bc24339303d77
-DIST patch-5.4.7.xz 272092 BLAKE2B dc9e1cede993144a4d9cb17cb91d3857b6492fa1a971c743268afdc601edfafb033abc3ac24cb7789d3f171ea7fb6b60ad5197da445ab72f5e9cf2ae00e7f495 SHA512 396eaf9fe88045e6e308cbe8e72217b3334b637bfa7e85f8d27cc4dd8e3d94c6f58d2b7b3e237defcf647d500610b85780ec2e21f1d91ac41c5f4ef3e74dc161
diff --git a/dev-util/perf/perf-5.4.7.ebuild b/dev-util/perf/perf-5.4.7.ebuild
deleted file mode 100644
index bec92bb4af8..00000000000
--- a/dev-util/perf/perf-5.4.7.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-inherit bash-completion-r1 estack eutils toolchain-funcs python-r1 linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
- LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
- PATCH_VERSION=$(ver_cut 1-3)
- LINUX_PATCH=patch-${PV//_/-}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
- https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ ${PV} == *.*.* ]] ; then
- # stable-release series
- LINUX_VER=$(ver_cut 1-2)
- LINUX_PATCH=patch-${PV}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
- LINUX_VER=${PV}
- SRC_URI=""
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit clang crypt debug +demangle +doc gtk java lzma numa perl python slang systemtap unwind zlib"
-# TODO babeltrace
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
- crypt? ( dev-libs/openssl:0= )
- clang? (
- sys-devel/clang:*
- sys-devel/llvm:*
- )
- demangle? ( sys-libs/binutils-libs:= )
- gtk? ( x11-libs/gtk+:2 )
- java? ( virtual/jre:* )
- lzma? ( app-arch/xz-utils )
- numa? ( sys-process/numactl )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- slang? ( sys-libs/slang )
- systemtap? ( dev-util/systemtap )
- 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"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-src_unpack() {
- local paths=(
- tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
- include lib "arch/*/lib"
- )
-
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
- > ${P}.patch
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- done
-
- # support clang8
- echo $(clang-major-version)
- if use clang; then
- local old_CC=${CC}
- CC=${CHOST}-clang
- if [[ $(clang-major-version) -ge 8 ]]; then
- pushd "${S_K}" >/dev/null || die
- eapply \
- "${FILESDIR}/perf-5.1.15-fix-clang8.patch" \
- "${FILESDIR}/perf-5.4.6-fix-clang9.patch"
- popd || die
- fi
- CC=${old_CC}
- fi
-
- pushd "${S_K}" >/dev/null || die
- eapply "${FILESDIR}/perf-5.4.7-propagate-cflags.patch"
- popd || die
-}
-
-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
- echo "#define PERF_VERSION \"${MY_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' {} +
-}
-
-puse() { usex $1 "" no; }
-perf_make() {
- # The arch parsing is a bit funky. The perf tools package is integrated
- # into the kernel, so it wants an ARCH that looks like the kernel arch,
- # but it also wants to know about the split value -- i386/x86_64 vs just
- # x86. We can get that by telling the func to use an older linux version.
- # It's kind of a hack, but not that bad ...
-
- # LIBDIR sets a search path of perf-gtk.so. Bug 515954
-
- local arch=$(tc-arch-kernel)
- local java_dir
- use java && java_dir="/etc/java-config-2/current-system-vm"
- # FIXME: NO_CORESIGHT
- # FIXME: NO_LIBBABELTRACE
- emake V=1 VF=1 \
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
- prefix="${EPREFIX}/usr" bindir_relative="bin" \
- EXTRA_CFLAGS="${CFLAGS}" \
- ARCH="${arch}" \
- JDIR="${java_dir}" \
- LIBCLANGLLVM=$(usex clang 1 "") \
- NO_AUXTRACE="" \
- NO_BACKTRACE="" \
- NO_CORESIGHT=1 \
- NO_DEMANGLE=$(puse demangle) \
- NO_GTK2=$(puse gtk) \
- NO_JVMTI=$(puse java) \
- NO_LIBAUDIT=$(puse audit) \
- NO_LIBBABELTRACE=1 \
- NO_LIBBIONIC=1 \
- NO_LIBBPF="" \
- NO_LIBCRYPTO=$(puse crypt) \
- NO_LIBDW_DWARF_UNWIND="" \
- NO_LIBELF="" \
- NO_LIBNUMA=$(puse numa) \
- NO_LIBPERL=$(puse perl) \
- NO_LIBPYTHON=$(puse python) \
- NO_LIBUNWIND=$(puse unwind) \
- NO_SDT=$(puse systemtap) \
- NO_SLANG=$(puse slang) \
- NO_LZMA=$(puse lzma) \
- NO_ZLIB= \
- WERROR=0 \
- LIBDIR="/usr/libexec/perf-core" \
- "$@"
-}
-
-src_compile() {
- # test-clang.bin not build with g++
- if use clang; then
- pushd "${S_K}/tools/build/feature/" || die
- make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
- popd
- fi
- perf_make -f Makefile.perf
- use doc && perf_make -C Documentation
-}
-
-src_test() {
- :
-}
-
-src_install() {
- _install_python_ext() {
- perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
- }
-
- perf_make -f Makefile.perf install DESTDIR="${D}"
- if use python; then
- python_foreach_impl _install_python_ext
- fi
-
- rm -rv "${ED}"/usr/share/doc/perf-tip || die
-
- if use gtk; then
- mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
- "${ED}"/usr/libexec/perf-core || die
- fi
-
- dodoc CREDITS
-
- dodoc *txt Documentation/*.txt
- if use doc ; then
- HTML_DOCS="Documentation/*.html" einstalldocs
- doman Documentation/*.1
- fi
-}
-
-pkg_postinst() {
- if ! use doc ; then
- elog "Without the doc USE flag you won't get any documentation nor man pages."
- elog "And without man pages, you won't get any --help output for perf and its"
- elog "sub-tools."
- fi
-}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2020-04-17 15:05 Yixun Lan
0 siblings, 0 replies; 141+ messages in thread
From: Yixun Lan @ 2020-04-17 15:05 UTC (permalink / raw
To: gentoo-commits
commit: a3902fa9fea4dc4b95436c7376cceb7fe953c39d
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 17 14:29:04 2020 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Fri Apr 17 14:47:44 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3902fa9
dev-util/perf: version bump, 5.6.4
drop the clang patches which I checked they are accepted by upstream,
notice that I haven't tested with clang toolchain since
I do not have the environment.
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
dev-util/perf/Manifest | 2 +
dev-util/perf/perf-5.6.4.ebuild | 226 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 228 insertions(+)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 2014946c1b6..df0c4d53a85 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -2,7 +2,9 @@ DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97
DIST linux-4.20.tar.xz 104257836 BLAKE2B fb52cad2897da319299486fa8c3b9415cd0aee0842dbf353a5b269720dcb902db407bb55dd95a77b212dcb4a488c15363d561f3649d6bd16885561f2466d90b1 SHA512 e282399beea5da539701aed2bc131abd5bc74a970dcd344163e9d295106dfd700180e672ed546ae5e55bc6b9ac95efd5ca1de2039015c1b7a6fc9c01ea6583d4
DIST linux-5.3.tar.xz 108558876 BLAKE2B 0d08eed879d05734e4542f0c93823d43f8dc042a54ba5268064c4bbebd7a9d59c03abf3ad5dee8280e784ae148a3b0c56181eaf2d5b3c079b6fe9f5191544df6 SHA512 6b5edef47c319a3fa7f6c20a3e0903a5acd89ec75e32dc5f99adcb60c9fe118ea312722d9c3d27e2e3900afa2455afb86e83a8b6bb131009bc79ddbe6fb0595d
DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
+DIST linux-5.6.tar.xz 111785252 BLAKE2B 8dbe02a8ca7fd3dcf512a15c5d8098c1e7f94257e65173fed43fcc45480e4ab790df8cd39bbbb4e2a21dc9a00385bc9bbe98215a31e7f7e1d9c8f21cd8ace69e SHA512 80846fe2b4e4a7ff471d2dde28a8216ae807a3209f959e93d39ea4fc9a189ea28ec3db9d303b3fe15a28c2cb90e7446876678e93e23353c2d6f262e364a06bc9
DIST patch-4.14.33.xz 905284 BLAKE2B e67bd9a96708aaaf65eb0aa852493b2323c9e237bfcc6fa837f795e481943ead3e2d5005ee72e40fc247df01c50877d9da3848a05aba3c999c3cfb7678cbdbc9 SHA512 5c76be5171709c2df7df7d5a8e8f3d0f7ede47b433da3b0f1710f262c8fcf5cf6c744a96d4336ea397c2c88a5f0a7507a5ab08c7c82f08deeb7a6f887ad77cfd
DIST patch-4.20.3.xz 91732 BLAKE2B bf99271bcb35508df239343fd6c9d57c246f88320b586e44e2d97771d08b249a24db230214d4957015a5ed35261e201f0680101b99d0e92f0f1f69bc53e21458 SHA512 47178b8e3bfe4ba09cb82bb1ce8b0742e6749d4be3412fb57518918f7109e74eac1d3d8eb32a43e21b3837a14f37d5eefd8cab819defd10cc2db61fb0ceddeaf
DIST patch-5.3.7.xz 255616 BLAKE2B 18ec40508fdb2cc17dd927f3ddef07b2b744ff993de75bb7adebe3a3f97c9383ea1845085899aa939ca8a15515420c18a1ac0ae832f9ae52f18cc8ed59a1e75f SHA512 bf2717b721b3acfd423537a6a520388e6a596ae65605ed8c029a67c117a002e9a21c324de0dd41407bfdc8ef95263687764f4f46aa59cbb50f68ab21b96c29d6
DIST patch-5.4.20.xz 776552 BLAKE2B bad2a95ed8521ac5c379fe91e16d60b2a38de19b9239755084621e5230677b232ec4cf9e2e8161c0022daff43fdbb37d5b5b5bfdc9e932ef3a860bcd17f640f8 SHA512 65fbcdbd41e35c17601ff15bbe33933be2ab7a694aa181a0b802cc11c1c653c9b688dbb382076cbad05983a0c07467955c035ae25f5175f7ce5bc24339303d77
+DIST patch-5.6.4.xz 34744 BLAKE2B 856148010fefa7e45903da23a054429f924920f1fd331b725d00906baaf6a05fee769c5c780ae6548b4f02846f945b12012c1216411c8d92aef7499babc42528 SHA512 05607a47ee72af4a7b4d8424a3995d92d0cf358902459993908df0e95643cbfa9eec7ed56779d254b7b75ec1c8dbec5eea5e2e845f40f5511533d53b90b1c02e
diff --git a/dev-util/perf/perf-5.6.4.ebuild b/dev-util/perf/perf-5.6.4.ebuild
new file mode 100644
index 00000000000..ac50bdd4988
--- /dev/null
+++ b/dev-util/perf/perf-5.6.4.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+inherit bash-completion-r1 estack eutils toolchain-funcs python-r1 linux-info
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+ LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+ PATCH_VERSION=$(ver_cut 1-3)
+ LINUX_PATCH=patch-${PV//_/-}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+ https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ ${PV} == *.*.* ]] ; then
+ # stable-release series
+ LINUX_VER=$(ver_cut 1-2)
+ LINUX_PATCH=patch-${PV}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+ LINUX_VER=${PV}
+ SRC_URI=""
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit clang crypt debug +demangle +doc gtk java lzma numa perl python slang systemtap unwind zlib"
+# TODO babeltrace
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="audit? ( sys-process/audit )
+ crypt? ( dev-libs/openssl:0= )
+ clang? (
+ sys-devel/clang:*
+ sys-devel/llvm:*
+ )
+ demangle? ( sys-libs/binutils-libs:= )
+ gtk? ( x11-libs/gtk+:2 )
+ java? ( virtual/jre:* )
+ lzma? ( app-arch/xz-utils )
+ numa? ( sys-process/numactl )
+ perl? ( dev-lang/perl:= )
+ python? ( ${PYTHON_DEPS} )
+ slang? ( sys-libs/slang )
+ systemtap? ( dev-util/systemtap )
+ 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"
+
+CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+
+src_unpack() {
+ local paths=(
+ tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
+ scripts include lib "arch/*/lib"
+ )
+
+ # We expect the tar implementation to support the -j option (both
+ # GNU tar and libarchive's tar support that).
+ echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+ tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+ "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ eshopts_push -o noglob
+ ebegin "Filtering partial source patch"
+ filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+ > ${P}.patch
+ eend $? || die "filterdiff failed"
+ eshopts_pop
+ fi
+
+ local a
+ for a in ${A}; do
+ [[ ${a} == ${LINUX_SOURCES} ]] && continue
+ [[ ${a} == ${LINUX_PATCH} ]] && continue
+ unpack ${a}
+ 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
+ echo "#define PERF_VERSION \"${MY_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' {} +
+}
+
+puse() { usex $1 "" no; }
+perf_make() {
+ # The arch parsing is a bit funky. The perf tools package is integrated
+ # into the kernel, so it wants an ARCH that looks like the kernel arch,
+ # but it also wants to know about the split value -- i386/x86_64 vs just
+ # x86. We can get that by telling the func to use an older linux version.
+ # It's kind of a hack, but not that bad ...
+
+ # LIBDIR sets a search path of perf-gtk.so. Bug 515954
+
+ local arch=$(tc-arch-kernel)
+ local java_dir
+ use java && java_dir="/etc/java-config-2/current-system-vm"
+ # FIXME: NO_CORESIGHT
+ # FIXME: NO_LIBBABELTRACE
+ emake V=1 VF=1 \
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
+ prefix="${EPREFIX}/usr" bindir_relative="bin" \
+ EXTRA_CFLAGS="${CFLAGS}" \
+ ARCH="${arch}" \
+ JDIR="${java_dir}" \
+ LIBCLANGLLVM=$(usex clang 1 "") \
+ NO_AUXTRACE="" \
+ NO_BACKTRACE="" \
+ NO_CORESIGHT=1 \
+ NO_DEMANGLE=$(puse demangle) \
+ NO_GTK2=$(puse gtk) \
+ NO_JVMTI=$(puse java) \
+ NO_LIBAUDIT=$(puse audit) \
+ NO_LIBBABELTRACE=1 \
+ NO_LIBBIONIC=1 \
+ NO_LIBBPF="" \
+ NO_LIBCRYPTO=$(puse crypt) \
+ NO_LIBDW_DWARF_UNWIND="" \
+ NO_LIBELF="" \
+ NO_LIBNUMA=$(puse numa) \
+ NO_LIBPERL=$(puse perl) \
+ NO_LIBPYTHON=$(puse python) \
+ NO_LIBUNWIND=$(puse unwind) \
+ NO_SDT=$(puse systemtap) \
+ NO_SLANG=$(puse slang) \
+ NO_LZMA=$(puse lzma) \
+ NO_ZLIB= \
+ WERROR=0 \
+ LIBDIR="/usr/libexec/perf-core" \
+ "$@"
+}
+
+src_compile() {
+ # test-clang.bin not build with g++
+ if use clang; then
+ pushd "${S_K}/tools/build/feature/" || die
+ make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
+ popd
+ fi
+ perf_make -f Makefile.perf
+ use doc && perf_make -C Documentation
+}
+
+src_test() {
+ :
+}
+
+src_install() {
+ _install_python_ext() {
+ perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
+ }
+
+ perf_make -f Makefile.perf install DESTDIR="${D}"
+ if use python; then
+ python_foreach_impl _install_python_ext
+ fi
+
+ rm -rv "${ED}"/usr/share/doc/perf-tip || die
+
+ if use gtk; then
+ mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
+ "${ED}"/usr/libexec/perf-core || die
+ fi
+
+ dodoc CREDITS
+
+ dodoc *txt Documentation/*.txt
+ if use doc ; then
+ HTML_DOCS="Documentation/*.html" einstalldocs
+ doman Documentation/*.1
+ fi
+}
+
+pkg_postinst() {
+ if ! use doc ; then
+ elog "Without the doc USE flag you won't get any documentation nor man pages."
+ elog "And without man pages, you won't get any --help output for perf and its"
+ elog "sub-tools."
+ fi
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2020-04-17 15:05 Yixun Lan
0 siblings, 0 replies; 141+ messages in thread
From: Yixun Lan @ 2020-04-17 15:05 UTC (permalink / raw
To: gentoo-commits
commit: 4230eec2015bf7ce24f6c0b69916deeed83fbd10
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 17 14:34:23 2020 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Fri Apr 17 14:47:47 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4230eec2
dev-util/perf: drop old
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
dev-util/perf/Manifest | 2 -
dev-util/perf/perf-5.3.7.ebuild | 237 ----------------------------------------
2 files changed, 239 deletions(-)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index df0c4d53a85..c76bed7cba7 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,10 +1,8 @@
DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
DIST linux-4.20.tar.xz 104257836 BLAKE2B fb52cad2897da319299486fa8c3b9415cd0aee0842dbf353a5b269720dcb902db407bb55dd95a77b212dcb4a488c15363d561f3649d6bd16885561f2466d90b1 SHA512 e282399beea5da539701aed2bc131abd5bc74a970dcd344163e9d295106dfd700180e672ed546ae5e55bc6b9ac95efd5ca1de2039015c1b7a6fc9c01ea6583d4
-DIST linux-5.3.tar.xz 108558876 BLAKE2B 0d08eed879d05734e4542f0c93823d43f8dc042a54ba5268064c4bbebd7a9d59c03abf3ad5dee8280e784ae148a3b0c56181eaf2d5b3c079b6fe9f5191544df6 SHA512 6b5edef47c319a3fa7f6c20a3e0903a5acd89ec75e32dc5f99adcb60c9fe118ea312722d9c3d27e2e3900afa2455afb86e83a8b6bb131009bc79ddbe6fb0595d
DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
DIST linux-5.6.tar.xz 111785252 BLAKE2B 8dbe02a8ca7fd3dcf512a15c5d8098c1e7f94257e65173fed43fcc45480e4ab790df8cd39bbbb4e2a21dc9a00385bc9bbe98215a31e7f7e1d9c8f21cd8ace69e SHA512 80846fe2b4e4a7ff471d2dde28a8216ae807a3209f959e93d39ea4fc9a189ea28ec3db9d303b3fe15a28c2cb90e7446876678e93e23353c2d6f262e364a06bc9
DIST patch-4.14.33.xz 905284 BLAKE2B e67bd9a96708aaaf65eb0aa852493b2323c9e237bfcc6fa837f795e481943ead3e2d5005ee72e40fc247df01c50877d9da3848a05aba3c999c3cfb7678cbdbc9 SHA512 5c76be5171709c2df7df7d5a8e8f3d0f7ede47b433da3b0f1710f262c8fcf5cf6c744a96d4336ea397c2c88a5f0a7507a5ab08c7c82f08deeb7a6f887ad77cfd
DIST patch-4.20.3.xz 91732 BLAKE2B bf99271bcb35508df239343fd6c9d57c246f88320b586e44e2d97771d08b249a24db230214d4957015a5ed35261e201f0680101b99d0e92f0f1f69bc53e21458 SHA512 47178b8e3bfe4ba09cb82bb1ce8b0742e6749d4be3412fb57518918f7109e74eac1d3d8eb32a43e21b3837a14f37d5eefd8cab819defd10cc2db61fb0ceddeaf
-DIST patch-5.3.7.xz 255616 BLAKE2B 18ec40508fdb2cc17dd927f3ddef07b2b744ff993de75bb7adebe3a3f97c9383ea1845085899aa939ca8a15515420c18a1ac0ae832f9ae52f18cc8ed59a1e75f SHA512 bf2717b721b3acfd423537a6a520388e6a596ae65605ed8c029a67c117a002e9a21c324de0dd41407bfdc8ef95263687764f4f46aa59cbb50f68ab21b96c29d6
DIST patch-5.4.20.xz 776552 BLAKE2B bad2a95ed8521ac5c379fe91e16d60b2a38de19b9239755084621e5230677b232ec4cf9e2e8161c0022daff43fdbb37d5b5b5bfdc9e932ef3a860bcd17f640f8 SHA512 65fbcdbd41e35c17601ff15bbe33933be2ab7a694aa181a0b802cc11c1c653c9b688dbb382076cbad05983a0c07467955c035ae25f5175f7ce5bc24339303d77
DIST patch-5.6.4.xz 34744 BLAKE2B 856148010fefa7e45903da23a054429f924920f1fd331b725d00906baaf6a05fee769c5c780ae6548b4f02846f945b12012c1216411c8d92aef7499babc42528 SHA512 05607a47ee72af4a7b4d8424a3995d92d0cf358902459993908df0e95643cbfa9eec7ed56779d254b7b75ec1c8dbec5eea5e2e845f40f5511533d53b90b1c02e
diff --git a/dev-util/perf/perf-5.3.7.ebuild b/dev-util/perf/perf-5.3.7.ebuild
deleted file mode 100644
index dbfe8de5c4b..00000000000
--- a/dev-util/perf/perf-5.3.7.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit bash-completion-r1 estack eutils toolchain-funcs python-single-r1 linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
- LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
- PATCH_VERSION=$(ver_cut 1-3)
- LINUX_PATCH=patch-${PV//_/-}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
- https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ ${PV} == *.*.* ]] ; then
- # stable-release series
- LINUX_VER=$(ver_cut 1-2)
- LINUX_PATCH=patch-${PV}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
- LINUX_VER=${PV}
- SRC_URI=""
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit clang crypt debug +demangle +doc gtk java lzma numa perl python slang systemtap unwind zlib"
-# TODO babeltrace
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
- crypt? ( dev-libs/openssl:0= )
- clang? (
- sys-devel/clang:*
- sys-devel/llvm:*
- )
- demangle? ( sys-libs/binutils-libs:= )
- gtk? ( x11-libs/gtk+:2 )
- java? ( virtual/jre:* )
- lzma? ( app-arch/xz-utils )
- numa? ( sys-process/numactl )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- slang? ( sys-libs/slang )
- systemtap? ( dev-util/systemtap )
- 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"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-pkg_setup() {
- linux-info_pkg_setup
- use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
- local paths=(
- tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
- include lib "arch/*/lib"
- )
-
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
- > ${P}.patch
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- done
-
- # support clang8
- echo $(clang-major-version)
- if use clang; then
- local old_CC=${CC}
- CC=${CHOST}-clang
- if [[ $(clang-major-version) -ge 8 ]]; then
- pushd "${S_K}" >/dev/null || die
- eapply "${FILESDIR}/perf-5.1.15-fix-clang8.patch"
- popd || die
- fi
- CC=${old_CC}
- fi
-}
-
-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
- echo "#define PERF_VERSION \"${MY_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' {} +
-}
-
-puse() { usex $1 "" no; }
-perf_make() {
- # The arch parsing is a bit funky. The perf tools package is integrated
- # into the kernel, so it wants an ARCH that looks like the kernel arch,
- # but it also wants to know about the split value -- i386/x86_64 vs just
- # x86. We can get that by telling the func to use an older linux version.
- # It's kind of a hack, but not that bad ...
-
- # LIBDIR sets a search path of perf-gtk.so. Bug 515954
-
- local arch=$(tc-arch-kernel)
- local java_dir
- use java && java_dir="/etc/java-config-2/current-system-vm"
- # FIXME: NO_CORESIGHT
- # FIXME: NO_LIBBABELTRACE
- emake V=1 VF=1 \
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
- prefix="${EPREFIX}/usr" bindir_relative="bin" \
- EXTRA_CFLAGS="${CFLAGS}" \
- ARCH="${arch}" \
- JDIR="${java_dir}" \
- LIBCLANGLLVM=$(usex clang 1 "") \
- NO_AUXTRACE="" \
- NO_BACKTRACE="" \
- NO_CORESIGHT=1 \
- NO_DEMANGLE=$(puse demangle) \
- NO_GTK2=$(puse gtk) \
- NO_JVMTI=$(puse java) \
- NO_LIBAUDIT=$(puse audit) \
- NO_LIBBABELTRACE=1 \
- NO_LIBBIONIC=1 \
- NO_LIBBPF="" \
- NO_LIBCRYPTO=$(puse crypt) \
- NO_LIBDW_DWARF_UNWIND="" \
- NO_LIBELF="" \
- NO_LIBNUMA=$(puse numa) \
- NO_LIBPERL=$(puse perl) \
- NO_LIBPYTHON=$(puse python) \
- NO_LIBUNWIND=$(puse unwind) \
- NO_SDT=$(puse systemtap) \
- NO_SLANG=$(puse slang) \
- NO_LZMA=$(puse lzma) \
- NO_ZLIB= \
- WERROR=0 \
- LIBDIR="/usr/libexec/perf-core" \
- "$@"
-}
-
-src_compile() {
- # test-clang.bin not build with g++
- if use clang; then
- pushd "${S_K}/tools/build/feature/" || die
- make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
- popd
- fi
- perf_make -f Makefile.perf
- use doc && perf_make -C Documentation
-}
-
-src_test() {
- :
-}
-
-src_install() {
- perf_make -f Makefile.perf install DESTDIR="${D}"
-
- rm -rv "${ED}"/usr/share/doc/perf-tip || die
-
- if use gtk; then
- mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
- "${ED}"/usr/libexec/perf-core || die
- fi
-
- dodoc CREDITS
-
- dodoc *txt Documentation/*.txt
- if use doc ; then
- HTML_DOCS="Documentation/*.html" einstalldocs
- doman Documentation/*.1
- fi
-}
-
-pkg_postinst() {
- if ! use doc ; then
- elog "Without the doc USE flag you won't get any documentation nor man pages."
- elog "And without man pages, you won't get any --help output for perf and its"
- elog "sub-tools."
- fi
-}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2020-04-24 20:50 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2020-04-24 20:50 UTC (permalink / raw
To: gentoo-commits
commit: 061e5694572cc06e6a711e03de4141af87000a7a
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 24 20:45:53 2020 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Fri Apr 24 20:46:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=061e5694
dev-util/perf: use LLVM_MAX_SLOT=9 (bug 718644)
Closes: https://bugs.gentoo.org/718644
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/perf-5.6.4.ebuild | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/dev-util/perf/perf-5.6.4.ebuild b/dev-util/perf/perf-5.6.4.ebuild
index ac50bdd4988..3f1d4e665d1 100644
--- a/dev-util/perf/perf-5.6.4.ebuild
+++ b/dev-util/perf/perf-5.6.4.ebuild
@@ -4,7 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python2_7 python3_{6,7} )
-inherit bash-completion-r1 estack eutils toolchain-funcs python-r1 linux-info
+inherit bash-completion-r1 estack eutils llvm toolchain-funcs python-r1 linux-info
MY_PV="${PV/_/-}"
MY_PV="${MY_PV/-pre/-git}"
@@ -42,8 +42,8 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="audit? ( sys-process/audit )
crypt? ( dev-libs/openssl:0= )
clang? (
- sys-devel/clang:*
- sys-devel/llvm:*
+ <sys-devel/clang-10:*
+ <sys-devel/llvm-10:*
)
demangle? ( sys-libs/binutils-libs:= )
gtk? ( x11-libs/gtk+:2 )
@@ -75,6 +75,10 @@ S="${S_K}/tools/perf"
CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+pkg_setup() {
+ LLVM_MAX_SLOT=9 llvm_pkg_setup
+}
+
src_unpack() {
local paths=(
tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2020-05-06 8:26 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2020-05-06 8:26 UTC (permalink / raw
To: gentoo-commits
commit: a6dc45ebd9ec00d4f2d11d7e5f930a48e5e83f02
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Wed May 6 08:24:05 2020 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Wed May 6 08:26:10 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6dc45eb
dev-util/perf: add myself as maintainer
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/metadata.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/dev-util/perf/metadata.xml b/dev-util/perf/metadata.xml
index 8ec543d2535..6755b763251 100644
--- a/dev-util/perf/metadata.xml
+++ b/dev-util/perf/metadata.xml
@@ -8,6 +8,10 @@
<email>dlan@gentoo.org</email>
<name>Yixun Lan</name>
</maintainer>
+ <maintainer type="person">
+ <email>amadio@gentoo.org</email>
+ <name>Guilherme Amadio</name>
+ </maintainer>
<use>
<flag name="clang">Enable builtin clang and LLVM support</flag>
<flag name="demangle">
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2020-05-06 8:26 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2020-05-06 8:26 UTC (permalink / raw
To: gentoo-commits
commit: 15a842ccfb8e0fb2873e3bee654520eb7a76ce0b
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Wed May 6 08:03:33 2020 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Wed May 6 08:25:38 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15a842cc
dev-util/perf: run llvm_pkg_setup only with USE=clang, bug #720376
Closes: https://bugs.gentoo.org/720376
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/perf-5.6.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-5.6.4.ebuild b/dev-util/perf/perf-5.6.4.ebuild
index 3f1d4e665d1..79a230faed3 100644
--- a/dev-util/perf/perf-5.6.4.ebuild
+++ b/dev-util/perf/perf-5.6.4.ebuild
@@ -76,7 +76,7 @@ S="${S_K}/tools/perf"
CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
pkg_setup() {
- LLVM_MAX_SLOT=9 llvm_pkg_setup
+ use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
}
src_unpack() {
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2020-05-06 8:26 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2020-05-06 8:26 UTC (permalink / raw
To: gentoo-commits
commit: 8aeb1a1a3c517297a4cdb6942f1ff38a61776950
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Wed May 6 08:18:44 2020 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Wed May 6 08:25:38 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aeb1a1a
dev-util/perf: use python from prefix
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/perf-5.6.4.ebuild | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-5.6.4.ebuild b/dev-util/perf/perf-5.6.4.ebuild
index 79a230faed3..3067d7243be 100644
--- a/dev-util/perf/perf-5.6.4.ebuild
+++ b/dev-util/perf/perf-5.6.4.ebuild
@@ -4,7 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python2_7 python3_{6,7} )
-inherit bash-completion-r1 estack eutils llvm toolchain-funcs python-r1 linux-info
+inherit bash-completion-r1 estack eutils llvm toolchain-funcs prefix python-r1 linux-info
MY_PV="${PV/_/-}"
MY_PV="${MY_PV/-pre/-git}"
@@ -130,6 +130,11 @@ src_prepare() {
# 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; }
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2020-05-07 15:08 Michał Górny
0 siblings, 0 replies; 141+ messages in thread
From: Michał Górny @ 2020-05-07 15:08 UTC (permalink / raw
To: gentoo-commits
commit: 3e0b24d1b6630bbfe6935849b3fe1ae20b145259
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May 7 15:02:25 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 7 15:07:58 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e0b24d1
dev-util/perf: Remove py2.7 where possible
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-util/perf/perf-5.4.20.ebuild | 2 +-
dev-util/perf/perf-5.6.4.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-util/perf/perf-5.4.20.ebuild b/dev-util/perf/perf-5.4.20.ebuild
index 3075642225a..368079291ba 100644
--- a/dev-util/perf/perf-5.4.20.ebuild
+++ b/dev-util/perf/perf-5.4.20.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
inherit bash-completion-r1 estack eutils toolchain-funcs python-r1 linux-info
MY_PV="${PV/_/-}"
diff --git a/dev-util/perf/perf-5.6.4.ebuild b/dev-util/perf/perf-5.6.4.ebuild
index 3067d7243be..5e376d9ded3 100644
--- a/dev-util/perf/perf-5.6.4.ebuild
+++ b/dev-util/perf/perf-5.6.4.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
inherit bash-completion-r1 estack eutils llvm toolchain-funcs prefix python-r1 linux-info
MY_PV="${PV/_/-}"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2020-05-17 17:39 Mike Frysinger
0 siblings, 0 replies; 141+ messages in thread
From: Mike Frysinger @ 2020-05-17 17:39 UTC (permalink / raw
To: gentoo-commits
commit: a5036a08d3d56de723379c8115a4a0f2b1e7e5cd
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun May 17 17:39:20 2020 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun May 17 17:39:46 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5036a08
dev-util/perf: fix pkg-config handling
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
dev-util/perf/perf-5.6.4.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-util/perf/perf-5.6.4.ebuild b/dev-util/perf/perf-5.6.4.ebuild
index 5e376d9ded3..867ad0c5d5c 100644
--- a/dev-util/perf/perf-5.6.4.ebuild
+++ b/dev-util/perf/perf-5.6.4.ebuild
@@ -154,6 +154,7 @@ perf_make() {
# FIXME: NO_LIBBABELTRACE
emake V=1 VF=1 \
CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
+ PKG_CONFIG="$(tc-getPKG_CONFIG)" \
prefix="${EPREFIX}/usr" bindir_relative="bin" \
EXTRA_CFLAGS="${CFLAGS}" \
ARCH="${arch}" \
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2020-05-22 13:06 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2020-05-22 13:06 UTC (permalink / raw
To: gentoo-commits
commit: 53994cf6c4350f80c96125897ce8049d0294295a
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Fri May 22 09:57:30 2020 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Fri May 22 13:06:24 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53994cf6
dev-util/perf: version bump
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/Manifest | 1 +
dev-util/perf/perf-5.6.14.ebuild | 236 +++++++++++++++++++++++++++++++++++++++
2 files changed, 237 insertions(+)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index c76bed7cba7..80a0a902057 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -5,4 +5,5 @@ DIST linux-5.6.tar.xz 111785252 BLAKE2B 8dbe02a8ca7fd3dcf512a15c5d8098c1e7f94257
DIST patch-4.14.33.xz 905284 BLAKE2B e67bd9a96708aaaf65eb0aa852493b2323c9e237bfcc6fa837f795e481943ead3e2d5005ee72e40fc247df01c50877d9da3848a05aba3c999c3cfb7678cbdbc9 SHA512 5c76be5171709c2df7df7d5a8e8f3d0f7ede47b433da3b0f1710f262c8fcf5cf6c744a96d4336ea397c2c88a5f0a7507a5ab08c7c82f08deeb7a6f887ad77cfd
DIST patch-4.20.3.xz 91732 BLAKE2B bf99271bcb35508df239343fd6c9d57c246f88320b586e44e2d97771d08b249a24db230214d4957015a5ed35261e201f0680101b99d0e92f0f1f69bc53e21458 SHA512 47178b8e3bfe4ba09cb82bb1ce8b0742e6749d4be3412fb57518918f7109e74eac1d3d8eb32a43e21b3837a14f37d5eefd8cab819defd10cc2db61fb0ceddeaf
DIST patch-5.4.20.xz 776552 BLAKE2B bad2a95ed8521ac5c379fe91e16d60b2a38de19b9239755084621e5230677b232ec4cf9e2e8161c0022daff43fdbb37d5b5b5bfdc9e932ef3a860bcd17f640f8 SHA512 65fbcdbd41e35c17601ff15bbe33933be2ab7a694aa181a0b802cc11c1c653c9b688dbb382076cbad05983a0c07467955c035ae25f5175f7ce5bc24339303d77
+DIST patch-5.6.14.xz 376464 BLAKE2B 01b64288759faa67aedfded7dfca5d8d1e894a863bf7bcaf91dd8f23c8b8c9df51d2e54ac5e414a33fc3469b32c10f1d630cf2636206b8e159d602df40ad3048 SHA512 8019bf12993f43d5508845a48b250d30220a8db6db262c8b97cd3f7c73abf0d054fcdfacb671644de529ceb495b95982d693a889051fb60fafc3180bd5b4f29e
DIST patch-5.6.4.xz 34744 BLAKE2B 856148010fefa7e45903da23a054429f924920f1fd331b725d00906baaf6a05fee769c5c780ae6548b4f02846f945b12012c1216411c8d92aef7499babc42528 SHA512 05607a47ee72af4a7b4d8424a3995d92d0cf358902459993908df0e95643cbfa9eec7ed56779d254b7b75ec1c8dbec5eea5e2e845f40f5511533d53b90b1c02e
diff --git a/dev-util/perf/perf-5.6.14.ebuild b/dev-util/perf/perf-5.6.14.ebuild
new file mode 100644
index 00000000000..afc8951d08d
--- /dev/null
+++ b/dev-util/perf/perf-5.6.14.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit bash-completion-r1 estack eutils llvm toolchain-funcs prefix python-r1 linux-info
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+ LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+ PATCH_VERSION=$(ver_cut 1-3)
+ LINUX_PATCH=patch-${PV//_/-}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+ https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ ${PV} == *.*.* ]] ; then
+ # stable-release series
+ LINUX_VER=$(ver_cut 1-2)
+ LINUX_PATCH=patch-${PV}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+ LINUX_VER=${PV}
+ SRC_URI=""
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit clang crypt debug +demangle +doc gtk java lzma numa perl python slang systemtap unwind zlib"
+# TODO babeltrace
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="audit? ( sys-process/audit )
+ crypt? ( dev-libs/openssl:0= )
+ clang? (
+ <sys-devel/clang-10:*
+ <sys-devel/llvm-10:*
+ )
+ demangle? ( sys-libs/binutils-libs:= )
+ gtk? ( x11-libs/gtk+:2 )
+ java? ( virtual/jre:* )
+ lzma? ( app-arch/xz-utils )
+ numa? ( sys-process/numactl )
+ perl? ( dev-lang/perl:= )
+ python? ( ${PYTHON_DEPS} )
+ slang? ( sys-libs/slang )
+ systemtap? ( dev-util/systemtap )
+ 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"
+
+CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+
+pkg_setup() {
+ use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
+}
+
+src_unpack() {
+ local paths=(
+ tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
+ scripts include lib "arch/*/lib"
+ )
+
+ # We expect the tar implementation to support the -j option (both
+ # GNU tar and libarchive's tar support that).
+ echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+ tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+ "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ eshopts_push -o noglob
+ ebegin "Filtering partial source patch"
+ filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+ > ${P}.patch
+ eend $? || die "filterdiff failed"
+ eshopts_pop
+ fi
+
+ local a
+ for a in ${A}; do
+ [[ ${a} == ${LINUX_SOURCES} ]] && continue
+ [[ ${a} == ${LINUX_PATCH} ]] && continue
+ unpack ${a}
+ 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
+ echo "#define PERF_VERSION \"${MY_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
+ # into the kernel, so it wants an ARCH that looks like the kernel arch,
+ # but it also wants to know about the split value -- i386/x86_64 vs just
+ # x86. We can get that by telling the func to use an older linux version.
+ # It's kind of a hack, but not that bad ...
+
+ # LIBDIR sets a search path of perf-gtk.so. Bug 515954
+
+ local arch=$(tc-arch-kernel)
+ local java_dir
+ use java && java_dir="/etc/java-config-2/current-system-vm"
+ # FIXME: NO_CORESIGHT
+ # FIXME: NO_LIBBABELTRACE
+ emake V=1 VF=1 \
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
+ PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+ prefix="${EPREFIX}/usr" bindir_relative="bin" \
+ EXTRA_CFLAGS="${CFLAGS}" \
+ ARCH="${arch}" \
+ JDIR="${java_dir}" \
+ LIBCLANGLLVM=$(usex clang 1 "") \
+ NO_AUXTRACE="" \
+ NO_BACKTRACE="" \
+ NO_CORESIGHT=1 \
+ NO_DEMANGLE=$(puse demangle) \
+ NO_GTK2=$(puse gtk) \
+ NO_JVMTI=$(puse java) \
+ NO_LIBAUDIT=$(puse audit) \
+ NO_LIBBABELTRACE=1 \
+ NO_LIBBIONIC=1 \
+ NO_LIBBPF="" \
+ NO_LIBCRYPTO=$(puse crypt) \
+ NO_LIBDW_DWARF_UNWIND="" \
+ NO_LIBELF="" \
+ NO_LIBNUMA=$(puse numa) \
+ NO_LIBPERL=$(puse perl) \
+ NO_LIBPYTHON=$(puse python) \
+ NO_LIBUNWIND=$(puse unwind) \
+ NO_SDT=$(puse systemtap) \
+ NO_SLANG=$(puse slang) \
+ NO_LZMA=$(puse lzma) \
+ NO_ZLIB= \
+ WERROR=0 \
+ LIBDIR="/usr/libexec/perf-core" \
+ "$@"
+}
+
+src_compile() {
+ # test-clang.bin not build with g++
+ if use clang; then
+ pushd "${S_K}/tools/build/feature/" || die
+ make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
+ popd
+ fi
+ perf_make -f Makefile.perf
+ use doc && perf_make -C Documentation
+}
+
+src_test() {
+ :
+}
+
+src_install() {
+ _install_python_ext() {
+ perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
+ }
+
+ perf_make -f Makefile.perf install DESTDIR="${D}"
+ if use python; then
+ python_foreach_impl _install_python_ext
+ fi
+
+ rm -rv "${ED}"/usr/share/doc/perf-tip || die
+
+ if use gtk; then
+ mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
+ "${ED}"/usr/libexec/perf-core || die
+ fi
+
+ dodoc CREDITS
+
+ dodoc *txt Documentation/*.txt
+ if use doc ; then
+ HTML_DOCS="Documentation/*.html" einstalldocs
+ doman Documentation/*.1
+ fi
+}
+
+pkg_postinst() {
+ if ! use doc ; then
+ elog "Without the doc USE flag you won't get any documentation nor man pages."
+ elog "And without man pages, you won't get any --help output for perf and its"
+ elog "sub-tools."
+ fi
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2020-05-26 0:47 Yixun Lan
0 siblings, 0 replies; 141+ messages in thread
From: Yixun Lan @ 2020-05-26 0:47 UTC (permalink / raw
To: gentoo-commits
commit: d60e486daffa0a22f5bbf5c24b96ce4f80664ed7
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Mon May 25 14:25:14 2020 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue May 26 00:43:23 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d60e486d
dev-util/perf: drop old
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
dev-util/perf/Manifest | 1 -
dev-util/perf/perf-5.6.4.ebuild | 236 ----------------------------------------
2 files changed, 237 deletions(-)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 80a0a902057..0eda2f82c55 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -6,4 +6,3 @@ DIST patch-4.14.33.xz 905284 BLAKE2B e67bd9a96708aaaf65eb0aa852493b2323c9e237bfc
DIST patch-4.20.3.xz 91732 BLAKE2B bf99271bcb35508df239343fd6c9d57c246f88320b586e44e2d97771d08b249a24db230214d4957015a5ed35261e201f0680101b99d0e92f0f1f69bc53e21458 SHA512 47178b8e3bfe4ba09cb82bb1ce8b0742e6749d4be3412fb57518918f7109e74eac1d3d8eb32a43e21b3837a14f37d5eefd8cab819defd10cc2db61fb0ceddeaf
DIST patch-5.4.20.xz 776552 BLAKE2B bad2a95ed8521ac5c379fe91e16d60b2a38de19b9239755084621e5230677b232ec4cf9e2e8161c0022daff43fdbb37d5b5b5bfdc9e932ef3a860bcd17f640f8 SHA512 65fbcdbd41e35c17601ff15bbe33933be2ab7a694aa181a0b802cc11c1c653c9b688dbb382076cbad05983a0c07467955c035ae25f5175f7ce5bc24339303d77
DIST patch-5.6.14.xz 376464 BLAKE2B 01b64288759faa67aedfded7dfca5d8d1e894a863bf7bcaf91dd8f23c8b8c9df51d2e54ac5e414a33fc3469b32c10f1d630cf2636206b8e159d602df40ad3048 SHA512 8019bf12993f43d5508845a48b250d30220a8db6db262c8b97cd3f7c73abf0d054fcdfacb671644de529ceb495b95982d693a889051fb60fafc3180bd5b4f29e
-DIST patch-5.6.4.xz 34744 BLAKE2B 856148010fefa7e45903da23a054429f924920f1fd331b725d00906baaf6a05fee769c5c780ae6548b4f02846f945b12012c1216411c8d92aef7499babc42528 SHA512 05607a47ee72af4a7b4d8424a3995d92d0cf358902459993908df0e95643cbfa9eec7ed56779d254b7b75ec1c8dbec5eea5e2e845f40f5511533d53b90b1c02e
diff --git a/dev-util/perf/perf-5.6.4.ebuild b/dev-util/perf/perf-5.6.4.ebuild
deleted file mode 100644
index 867ad0c5d5c..00000000000
--- a/dev-util/perf/perf-5.6.4.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit bash-completion-r1 estack eutils llvm toolchain-funcs prefix python-r1 linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
- LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
- PATCH_VERSION=$(ver_cut 1-3)
- LINUX_PATCH=patch-${PV//_/-}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
- https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ ${PV} == *.*.* ]] ; then
- # stable-release series
- LINUX_VER=$(ver_cut 1-2)
- LINUX_PATCH=patch-${PV}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
- LINUX_VER=${PV}
- SRC_URI=""
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit clang crypt debug +demangle +doc gtk java lzma numa perl python slang systemtap unwind zlib"
-# TODO babeltrace
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
- crypt? ( dev-libs/openssl:0= )
- clang? (
- <sys-devel/clang-10:*
- <sys-devel/llvm-10:*
- )
- demangle? ( sys-libs/binutils-libs:= )
- gtk? ( x11-libs/gtk+:2 )
- java? ( virtual/jre:* )
- lzma? ( app-arch/xz-utils )
- numa? ( sys-process/numactl )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- slang? ( sys-libs/slang )
- systemtap? ( dev-util/systemtap )
- 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"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-pkg_setup() {
- use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
-}
-
-src_unpack() {
- local paths=(
- tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
- scripts include lib "arch/*/lib"
- )
-
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
- > ${P}.patch
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- 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
- echo "#define PERF_VERSION \"${MY_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
- # into the kernel, so it wants an ARCH that looks like the kernel arch,
- # but it also wants to know about the split value -- i386/x86_64 vs just
- # x86. We can get that by telling the func to use an older linux version.
- # It's kind of a hack, but not that bad ...
-
- # LIBDIR sets a search path of perf-gtk.so. Bug 515954
-
- local arch=$(tc-arch-kernel)
- local java_dir
- use java && java_dir="/etc/java-config-2/current-system-vm"
- # FIXME: NO_CORESIGHT
- # FIXME: NO_LIBBABELTRACE
- emake V=1 VF=1 \
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \
- prefix="${EPREFIX}/usr" bindir_relative="bin" \
- EXTRA_CFLAGS="${CFLAGS}" \
- ARCH="${arch}" \
- JDIR="${java_dir}" \
- LIBCLANGLLVM=$(usex clang 1 "") \
- NO_AUXTRACE="" \
- NO_BACKTRACE="" \
- NO_CORESIGHT=1 \
- NO_DEMANGLE=$(puse demangle) \
- NO_GTK2=$(puse gtk) \
- NO_JVMTI=$(puse java) \
- NO_LIBAUDIT=$(puse audit) \
- NO_LIBBABELTRACE=1 \
- NO_LIBBIONIC=1 \
- NO_LIBBPF="" \
- NO_LIBCRYPTO=$(puse crypt) \
- NO_LIBDW_DWARF_UNWIND="" \
- NO_LIBELF="" \
- NO_LIBNUMA=$(puse numa) \
- NO_LIBPERL=$(puse perl) \
- NO_LIBPYTHON=$(puse python) \
- NO_LIBUNWIND=$(puse unwind) \
- NO_SDT=$(puse systemtap) \
- NO_SLANG=$(puse slang) \
- NO_LZMA=$(puse lzma) \
- NO_ZLIB= \
- WERROR=0 \
- LIBDIR="/usr/libexec/perf-core" \
- "$@"
-}
-
-src_compile() {
- # test-clang.bin not build with g++
- if use clang; then
- pushd "${S_K}/tools/build/feature/" || die
- make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
- popd
- fi
- perf_make -f Makefile.perf
- use doc && perf_make -C Documentation
-}
-
-src_test() {
- :
-}
-
-src_install() {
- _install_python_ext() {
- perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
- }
-
- perf_make -f Makefile.perf install DESTDIR="${D}"
- if use python; then
- python_foreach_impl _install_python_ext
- fi
-
- rm -rv "${ED}"/usr/share/doc/perf-tip || die
-
- if use gtk; then
- mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
- "${ED}"/usr/libexec/perf-core || die
- fi
-
- dodoc CREDITS
-
- dodoc *txt Documentation/*.txt
- if use doc ; then
- HTML_DOCS="Documentation/*.html" einstalldocs
- doman Documentation/*.1
- fi
-}
-
-pkg_postinst() {
- if ! use doc ; then
- elog "Without the doc USE flag you won't get any documentation nor man pages."
- elog "And without man pages, you won't get any --help output for perf and its"
- elog "sub-tools."
- fi
-}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2020-06-03 10:18 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2020-06-03 10:18 UTC (permalink / raw
To: gentoo-commits
commit: 6aead5e0c5b1587dbc88552df243ab9bdfc26262
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 3 10:17:42 2020 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Wed Jun 3 10:17:48 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6aead5e0
dev-util/perf: version bump to 5.7
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/Manifest | 1 +
dev-util/perf/perf-5.7.ebuild | 236 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 237 insertions(+)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 0eda2f82c55..52d6fa24d91 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -2,6 +2,7 @@ DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97
DIST linux-4.20.tar.xz 104257836 BLAKE2B fb52cad2897da319299486fa8c3b9415cd0aee0842dbf353a5b269720dcb902db407bb55dd95a77b212dcb4a488c15363d561f3649d6bd16885561f2466d90b1 SHA512 e282399beea5da539701aed2bc131abd5bc74a970dcd344163e9d295106dfd700180e672ed546ae5e55bc6b9ac95efd5ca1de2039015c1b7a6fc9c01ea6583d4
DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
DIST linux-5.6.tar.xz 111785252 BLAKE2B 8dbe02a8ca7fd3dcf512a15c5d8098c1e7f94257e65173fed43fcc45480e4ab790df8cd39bbbb4e2a21dc9a00385bc9bbe98215a31e7f7e1d9c8f21cd8ace69e SHA512 80846fe2b4e4a7ff471d2dde28a8216ae807a3209f959e93d39ea4fc9a189ea28ec3db9d303b3fe15a28c2cb90e7446876678e93e23353c2d6f262e364a06bc9
+DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f5d2c58b6137d383f16034a587225a75a9dbca6a01a433056ebe078487132c224e909a2971c9634687e47b1d1 SHA512 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
DIST patch-4.14.33.xz 905284 BLAKE2B e67bd9a96708aaaf65eb0aa852493b2323c9e237bfcc6fa837f795e481943ead3e2d5005ee72e40fc247df01c50877d9da3848a05aba3c999c3cfb7678cbdbc9 SHA512 5c76be5171709c2df7df7d5a8e8f3d0f7ede47b433da3b0f1710f262c8fcf5cf6c744a96d4336ea397c2c88a5f0a7507a5ab08c7c82f08deeb7a6f887ad77cfd
DIST patch-4.20.3.xz 91732 BLAKE2B bf99271bcb35508df239343fd6c9d57c246f88320b586e44e2d97771d08b249a24db230214d4957015a5ed35261e201f0680101b99d0e92f0f1f69bc53e21458 SHA512 47178b8e3bfe4ba09cb82bb1ce8b0742e6749d4be3412fb57518918f7109e74eac1d3d8eb32a43e21b3837a14f37d5eefd8cab819defd10cc2db61fb0ceddeaf
DIST patch-5.4.20.xz 776552 BLAKE2B bad2a95ed8521ac5c379fe91e16d60b2a38de19b9239755084621e5230677b232ec4cf9e2e8161c0022daff43fdbb37d5b5b5bfdc9e932ef3a860bcd17f640f8 SHA512 65fbcdbd41e35c17601ff15bbe33933be2ab7a694aa181a0b802cc11c1c653c9b688dbb382076cbad05983a0c07467955c035ae25f5175f7ce5bc24339303d77
diff --git a/dev-util/perf/perf-5.7.ebuild b/dev-util/perf/perf-5.7.ebuild
new file mode 100644
index 00000000000..afc8951d08d
--- /dev/null
+++ b/dev-util/perf/perf-5.7.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit bash-completion-r1 estack eutils llvm toolchain-funcs prefix python-r1 linux-info
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+ LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+ PATCH_VERSION=$(ver_cut 1-3)
+ LINUX_PATCH=patch-${PV//_/-}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+ https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ ${PV} == *.*.* ]] ; then
+ # stable-release series
+ LINUX_VER=$(ver_cut 1-2)
+ LINUX_PATCH=patch-${PV}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+ LINUX_VER=${PV}
+ SRC_URI=""
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit clang crypt debug +demangle +doc gtk java lzma numa perl python slang systemtap unwind zlib"
+# TODO babeltrace
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="audit? ( sys-process/audit )
+ crypt? ( dev-libs/openssl:0= )
+ clang? (
+ <sys-devel/clang-10:*
+ <sys-devel/llvm-10:*
+ )
+ demangle? ( sys-libs/binutils-libs:= )
+ gtk? ( x11-libs/gtk+:2 )
+ java? ( virtual/jre:* )
+ lzma? ( app-arch/xz-utils )
+ numa? ( sys-process/numactl )
+ perl? ( dev-lang/perl:= )
+ python? ( ${PYTHON_DEPS} )
+ slang? ( sys-libs/slang )
+ systemtap? ( dev-util/systemtap )
+ 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"
+
+CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+
+pkg_setup() {
+ use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
+}
+
+src_unpack() {
+ local paths=(
+ tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
+ scripts include lib "arch/*/lib"
+ )
+
+ # We expect the tar implementation to support the -j option (both
+ # GNU tar and libarchive's tar support that).
+ echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+ tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+ "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ eshopts_push -o noglob
+ ebegin "Filtering partial source patch"
+ filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+ > ${P}.patch
+ eend $? || die "filterdiff failed"
+ eshopts_pop
+ fi
+
+ local a
+ for a in ${A}; do
+ [[ ${a} == ${LINUX_SOURCES} ]] && continue
+ [[ ${a} == ${LINUX_PATCH} ]] && continue
+ unpack ${a}
+ 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
+ echo "#define PERF_VERSION \"${MY_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
+ # into the kernel, so it wants an ARCH that looks like the kernel arch,
+ # but it also wants to know about the split value -- i386/x86_64 vs just
+ # x86. We can get that by telling the func to use an older linux version.
+ # It's kind of a hack, but not that bad ...
+
+ # LIBDIR sets a search path of perf-gtk.so. Bug 515954
+
+ local arch=$(tc-arch-kernel)
+ local java_dir
+ use java && java_dir="/etc/java-config-2/current-system-vm"
+ # FIXME: NO_CORESIGHT
+ # FIXME: NO_LIBBABELTRACE
+ emake V=1 VF=1 \
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
+ PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+ prefix="${EPREFIX}/usr" bindir_relative="bin" \
+ EXTRA_CFLAGS="${CFLAGS}" \
+ ARCH="${arch}" \
+ JDIR="${java_dir}" \
+ LIBCLANGLLVM=$(usex clang 1 "") \
+ NO_AUXTRACE="" \
+ NO_BACKTRACE="" \
+ NO_CORESIGHT=1 \
+ NO_DEMANGLE=$(puse demangle) \
+ NO_GTK2=$(puse gtk) \
+ NO_JVMTI=$(puse java) \
+ NO_LIBAUDIT=$(puse audit) \
+ NO_LIBBABELTRACE=1 \
+ NO_LIBBIONIC=1 \
+ NO_LIBBPF="" \
+ NO_LIBCRYPTO=$(puse crypt) \
+ NO_LIBDW_DWARF_UNWIND="" \
+ NO_LIBELF="" \
+ NO_LIBNUMA=$(puse numa) \
+ NO_LIBPERL=$(puse perl) \
+ NO_LIBPYTHON=$(puse python) \
+ NO_LIBUNWIND=$(puse unwind) \
+ NO_SDT=$(puse systemtap) \
+ NO_SLANG=$(puse slang) \
+ NO_LZMA=$(puse lzma) \
+ NO_ZLIB= \
+ WERROR=0 \
+ LIBDIR="/usr/libexec/perf-core" \
+ "$@"
+}
+
+src_compile() {
+ # test-clang.bin not build with g++
+ if use clang; then
+ pushd "${S_K}/tools/build/feature/" || die
+ make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
+ popd
+ fi
+ perf_make -f Makefile.perf
+ use doc && perf_make -C Documentation
+}
+
+src_test() {
+ :
+}
+
+src_install() {
+ _install_python_ext() {
+ perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
+ }
+
+ perf_make -f Makefile.perf install DESTDIR="${D}"
+ if use python; then
+ python_foreach_impl _install_python_ext
+ fi
+
+ rm -rv "${ED}"/usr/share/doc/perf-tip || die
+
+ if use gtk; then
+ mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
+ "${ED}"/usr/libexec/perf-core || die
+ fi
+
+ dodoc CREDITS
+
+ dodoc *txt Documentation/*.txt
+ if use doc ; then
+ HTML_DOCS="Documentation/*.html" einstalldocs
+ doman Documentation/*.1
+ fi
+}
+
+pkg_postinst() {
+ if ! use doc ; then
+ elog "Without the doc USE flag you won't get any documentation nor man pages."
+ elog "And without man pages, you won't get any --help output for perf and its"
+ elog "sub-tools."
+ fi
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2020-06-12 23:03 Sergei Trofimovich
0 siblings, 0 replies; 141+ messages in thread
From: Sergei Trofimovich @ 2020-06-12 23:03 UTC (permalink / raw
To: gentoo-commits
commit: aec008bcfbd1bb4891d70e23f7857cbb3b9e8d88
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 12 23:02:49 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Jun 12 23:02:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aec008bc
dev-util/perf: use user's CC in HOSTCC and friends
Reported-by: Agostino Sarubbo
Closes: https://bugs.gentoo.org/720698
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-util/perf/perf-5.7-r1.ebuild | 237 +++++++++++++++++++++++++++++++++++++++
1 file changed, 237 insertions(+)
diff --git a/dev-util/perf/perf-5.7-r1.ebuild b/dev-util/perf/perf-5.7-r1.ebuild
new file mode 100644
index 00000000000..d0b9058a60c
--- /dev/null
+++ b/dev-util/perf/perf-5.7-r1.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit bash-completion-r1 estack eutils llvm toolchain-funcs prefix python-r1 linux-info
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+ LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+ PATCH_VERSION=$(ver_cut 1-3)
+ LINUX_PATCH=patch-${PV//_/-}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+ https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ ${PV} == *.*.* ]] ; then
+ # stable-release series
+ LINUX_VER=$(ver_cut 1-2)
+ LINUX_PATCH=patch-${PV}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+ LINUX_VER=${PV}
+ SRC_URI=""
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit clang crypt debug +demangle +doc gtk java lzma numa perl python slang systemtap unwind zlib"
+# TODO babeltrace
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="audit? ( sys-process/audit )
+ crypt? ( dev-libs/openssl:0= )
+ clang? (
+ <sys-devel/clang-10:*
+ <sys-devel/llvm-10:*
+ )
+ demangle? ( sys-libs/binutils-libs:= )
+ gtk? ( x11-libs/gtk+:2 )
+ java? ( virtual/jre:* )
+ lzma? ( app-arch/xz-utils )
+ numa? ( sys-process/numactl )
+ perl? ( dev-lang/perl:= )
+ python? ( ${PYTHON_DEPS} )
+ slang? ( sys-libs/slang )
+ systemtap? ( dev-util/systemtap )
+ 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"
+
+CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+
+pkg_setup() {
+ use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
+}
+
+src_unpack() {
+ local paths=(
+ tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
+ scripts include lib "arch/*/lib"
+ )
+
+ # We expect the tar implementation to support the -j option (both
+ # GNU tar and libarchive's tar support that).
+ echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+ tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+ "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ eshopts_push -o noglob
+ ebegin "Filtering partial source patch"
+ filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+ > ${P}.patch
+ eend $? || die "filterdiff failed"
+ eshopts_pop
+ fi
+
+ local a
+ for a in ${A}; do
+ [[ ${a} == ${LINUX_SOURCES} ]] && continue
+ [[ ${a} == ${LINUX_PATCH} ]] && continue
+ unpack ${a}
+ 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
+ echo "#define PERF_VERSION \"${MY_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
+ # into the kernel, so it wants an ARCH that looks like the kernel arch,
+ # but it also wants to know about the split value -- i386/x86_64 vs just
+ # x86. We can get that by telling the func to use an older linux version.
+ # It's kind of a hack, but not that bad ...
+
+ # LIBDIR sets a search path of perf-gtk.so. Bug 515954
+
+ local arch=$(tc-arch-kernel)
+ local java_dir
+ use java && java_dir="/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)" \
+ PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+ prefix="${EPREFIX}/usr" bindir_relative="bin" \
+ EXTRA_CFLAGS="${CFLAGS}" \
+ ARCH="${arch}" \
+ JDIR="${java_dir}" \
+ LIBCLANGLLVM=$(usex clang 1 "") \
+ NO_AUXTRACE="" \
+ NO_BACKTRACE="" \
+ NO_CORESIGHT=1 \
+ NO_DEMANGLE=$(puse demangle) \
+ NO_GTK2=$(puse gtk) \
+ NO_JVMTI=$(puse java) \
+ NO_LIBAUDIT=$(puse audit) \
+ NO_LIBBABELTRACE=1 \
+ NO_LIBBIONIC=1 \
+ NO_LIBBPF="" \
+ NO_LIBCRYPTO=$(puse crypt) \
+ NO_LIBDW_DWARF_UNWIND="" \
+ NO_LIBELF="" \
+ NO_LIBNUMA=$(puse numa) \
+ NO_LIBPERL=$(puse perl) \
+ NO_LIBPYTHON=$(puse python) \
+ NO_LIBUNWIND=$(puse unwind) \
+ NO_SDT=$(puse systemtap) \
+ NO_SLANG=$(puse slang) \
+ NO_LZMA=$(puse lzma) \
+ NO_ZLIB= \
+ WERROR=0 \
+ LIBDIR="/usr/libexec/perf-core" \
+ "$@"
+}
+
+src_compile() {
+ # test-clang.bin not build with g++
+ if use clang; then
+ pushd "${S_K}/tools/build/feature/" || die
+ make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
+ popd
+ fi
+ perf_make -f Makefile.perf
+ use doc && perf_make -C Documentation
+}
+
+src_test() {
+ :
+}
+
+src_install() {
+ _install_python_ext() {
+ perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
+ }
+
+ perf_make -f Makefile.perf install DESTDIR="${D}"
+ if use python; then
+ python_foreach_impl _install_python_ext
+ fi
+
+ rm -rv "${ED}"/usr/share/doc/perf-tip || die
+
+ if use gtk; then
+ mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
+ "${ED}"/usr/libexec/perf-core || die
+ fi
+
+ dodoc CREDITS
+
+ dodoc *txt Documentation/*.txt
+ if use doc ; then
+ HTML_DOCS="Documentation/*.html" einstalldocs
+ doman Documentation/*.1
+ fi
+}
+
+pkg_postinst() {
+ if ! use doc ; then
+ elog "Without the doc USE flag you won't get any documentation nor man pages."
+ elog "And without man pages, you won't get any --help output for perf and its"
+ elog "sub-tools."
+ fi
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2020-08-26 2:41 Yixun Lan
0 siblings, 0 replies; 141+ messages in thread
From: Yixun Lan @ 2020-08-26 2:41 UTC (permalink / raw
To: gentoo-commits
commit: 0f7cf0bd5ffa0d01d69cce763d4597d5f2996600
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 02:40:15 2020 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 02:41:02 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f7cf0bd
dev-util/perf: drop old
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
dev-util/perf/Manifest | 2 -
dev-util/perf/perf-5.6.14.ebuild | 236 ---------------------------------------
dev-util/perf/perf-5.7.ebuild | 236 ---------------------------------------
3 files changed, 474 deletions(-)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index dbb9d798847..9066001b972 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,10 +1,8 @@
DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
DIST linux-4.20.tar.xz 104257836 BLAKE2B fb52cad2897da319299486fa8c3b9415cd0aee0842dbf353a5b269720dcb902db407bb55dd95a77b212dcb4a488c15363d561f3649d6bd16885561f2466d90b1 SHA512 e282399beea5da539701aed2bc131abd5bc74a970dcd344163e9d295106dfd700180e672ed546ae5e55bc6b9ac95efd5ca1de2039015c1b7a6fc9c01ea6583d4
DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-DIST linux-5.6.tar.xz 111785252 BLAKE2B 8dbe02a8ca7fd3dcf512a15c5d8098c1e7f94257e65173fed43fcc45480e4ab790df8cd39bbbb4e2a21dc9a00385bc9bbe98215a31e7f7e1d9c8f21cd8ace69e SHA512 80846fe2b4e4a7ff471d2dde28a8216ae807a3209f959e93d39ea4fc9a189ea28ec3db9d303b3fe15a28c2cb90e7446876678e93e23353c2d6f262e364a06bc9
DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f5d2c58b6137d383f16034a587225a75a9dbca6a01a433056ebe078487132c224e909a2971c9634687e47b1d1 SHA512 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
DIST patch-4.14.33.xz 905284 BLAKE2B e67bd9a96708aaaf65eb0aa852493b2323c9e237bfcc6fa837f795e481943ead3e2d5005ee72e40fc247df01c50877d9da3848a05aba3c999c3cfb7678cbdbc9 SHA512 5c76be5171709c2df7df7d5a8e8f3d0f7ede47b433da3b0f1710f262c8fcf5cf6c744a96d4336ea397c2c88a5f0a7507a5ab08c7c82f08deeb7a6f887ad77cfd
DIST patch-4.20.3.xz 91732 BLAKE2B bf99271bcb35508df239343fd6c9d57c246f88320b586e44e2d97771d08b249a24db230214d4957015a5ed35261e201f0680101b99d0e92f0f1f69bc53e21458 SHA512 47178b8e3bfe4ba09cb82bb1ce8b0742e6749d4be3412fb57518918f7109e74eac1d3d8eb32a43e21b3837a14f37d5eefd8cab819defd10cc2db61fb0ceddeaf
DIST patch-5.4.20.xz 776552 BLAKE2B bad2a95ed8521ac5c379fe91e16d60b2a38de19b9239755084621e5230677b232ec4cf9e2e8161c0022daff43fdbb37d5b5b5bfdc9e932ef3a860bcd17f640f8 SHA512 65fbcdbd41e35c17601ff15bbe33933be2ab7a694aa181a0b802cc11c1c653c9b688dbb382076cbad05983a0c07467955c035ae25f5175f7ce5bc24339303d77
-DIST patch-5.6.14.xz 376464 BLAKE2B 01b64288759faa67aedfded7dfca5d8d1e894a863bf7bcaf91dd8f23c8b8c9df51d2e54ac5e414a33fc3469b32c10f1d630cf2636206b8e159d602df40ad3048 SHA512 8019bf12993f43d5508845a48b250d30220a8db6db262c8b97cd3f7c73abf0d054fcdfacb671644de529ceb495b95982d693a889051fb60fafc3180bd5b4f29e
diff --git a/dev-util/perf/perf-5.6.14.ebuild b/dev-util/perf/perf-5.6.14.ebuild
deleted file mode 100644
index afc8951d08d..00000000000
--- a/dev-util/perf/perf-5.6.14.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit bash-completion-r1 estack eutils llvm toolchain-funcs prefix python-r1 linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
- LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
- PATCH_VERSION=$(ver_cut 1-3)
- LINUX_PATCH=patch-${PV//_/-}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
- https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ ${PV} == *.*.* ]] ; then
- # stable-release series
- LINUX_VER=$(ver_cut 1-2)
- LINUX_PATCH=patch-${PV}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
- LINUX_VER=${PV}
- SRC_URI=""
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit clang crypt debug +demangle +doc gtk java lzma numa perl python slang systemtap unwind zlib"
-# TODO babeltrace
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
- crypt? ( dev-libs/openssl:0= )
- clang? (
- <sys-devel/clang-10:*
- <sys-devel/llvm-10:*
- )
- demangle? ( sys-libs/binutils-libs:= )
- gtk? ( x11-libs/gtk+:2 )
- java? ( virtual/jre:* )
- lzma? ( app-arch/xz-utils )
- numa? ( sys-process/numactl )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- slang? ( sys-libs/slang )
- systemtap? ( dev-util/systemtap )
- 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"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-pkg_setup() {
- use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
-}
-
-src_unpack() {
- local paths=(
- tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
- scripts include lib "arch/*/lib"
- )
-
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
- > ${P}.patch
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- 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
- echo "#define PERF_VERSION \"${MY_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
- # into the kernel, so it wants an ARCH that looks like the kernel arch,
- # but it also wants to know about the split value -- i386/x86_64 vs just
- # x86. We can get that by telling the func to use an older linux version.
- # It's kind of a hack, but not that bad ...
-
- # LIBDIR sets a search path of perf-gtk.so. Bug 515954
-
- local arch=$(tc-arch-kernel)
- local java_dir
- use java && java_dir="/etc/java-config-2/current-system-vm"
- # FIXME: NO_CORESIGHT
- # FIXME: NO_LIBBABELTRACE
- emake V=1 VF=1 \
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \
- prefix="${EPREFIX}/usr" bindir_relative="bin" \
- EXTRA_CFLAGS="${CFLAGS}" \
- ARCH="${arch}" \
- JDIR="${java_dir}" \
- LIBCLANGLLVM=$(usex clang 1 "") \
- NO_AUXTRACE="" \
- NO_BACKTRACE="" \
- NO_CORESIGHT=1 \
- NO_DEMANGLE=$(puse demangle) \
- NO_GTK2=$(puse gtk) \
- NO_JVMTI=$(puse java) \
- NO_LIBAUDIT=$(puse audit) \
- NO_LIBBABELTRACE=1 \
- NO_LIBBIONIC=1 \
- NO_LIBBPF="" \
- NO_LIBCRYPTO=$(puse crypt) \
- NO_LIBDW_DWARF_UNWIND="" \
- NO_LIBELF="" \
- NO_LIBNUMA=$(puse numa) \
- NO_LIBPERL=$(puse perl) \
- NO_LIBPYTHON=$(puse python) \
- NO_LIBUNWIND=$(puse unwind) \
- NO_SDT=$(puse systemtap) \
- NO_SLANG=$(puse slang) \
- NO_LZMA=$(puse lzma) \
- NO_ZLIB= \
- WERROR=0 \
- LIBDIR="/usr/libexec/perf-core" \
- "$@"
-}
-
-src_compile() {
- # test-clang.bin not build with g++
- if use clang; then
- pushd "${S_K}/tools/build/feature/" || die
- make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
- popd
- fi
- perf_make -f Makefile.perf
- use doc && perf_make -C Documentation
-}
-
-src_test() {
- :
-}
-
-src_install() {
- _install_python_ext() {
- perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
- }
-
- perf_make -f Makefile.perf install DESTDIR="${D}"
- if use python; then
- python_foreach_impl _install_python_ext
- fi
-
- rm -rv "${ED}"/usr/share/doc/perf-tip || die
-
- if use gtk; then
- mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
- "${ED}"/usr/libexec/perf-core || die
- fi
-
- dodoc CREDITS
-
- dodoc *txt Documentation/*.txt
- if use doc ; then
- HTML_DOCS="Documentation/*.html" einstalldocs
- doman Documentation/*.1
- fi
-}
-
-pkg_postinst() {
- if ! use doc ; then
- elog "Without the doc USE flag you won't get any documentation nor man pages."
- elog "And without man pages, you won't get any --help output for perf and its"
- elog "sub-tools."
- fi
-}
diff --git a/dev-util/perf/perf-5.7.ebuild b/dev-util/perf/perf-5.7.ebuild
deleted file mode 100644
index afc8951d08d..00000000000
--- a/dev-util/perf/perf-5.7.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit bash-completion-r1 estack eutils llvm toolchain-funcs prefix python-r1 linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
- LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
- PATCH_VERSION=$(ver_cut 1-3)
- LINUX_PATCH=patch-${PV//_/-}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
- https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ ${PV} == *.*.* ]] ; then
- # stable-release series
- LINUX_VER=$(ver_cut 1-2)
- LINUX_PATCH=patch-${PV}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
- LINUX_VER=${PV}
- SRC_URI=""
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit clang crypt debug +demangle +doc gtk java lzma numa perl python slang systemtap unwind zlib"
-# TODO babeltrace
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
- crypt? ( dev-libs/openssl:0= )
- clang? (
- <sys-devel/clang-10:*
- <sys-devel/llvm-10:*
- )
- demangle? ( sys-libs/binutils-libs:= )
- gtk? ( x11-libs/gtk+:2 )
- java? ( virtual/jre:* )
- lzma? ( app-arch/xz-utils )
- numa? ( sys-process/numactl )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- slang? ( sys-libs/slang )
- systemtap? ( dev-util/systemtap )
- 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"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-pkg_setup() {
- use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
-}
-
-src_unpack() {
- local paths=(
- tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
- scripts include lib "arch/*/lib"
- )
-
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
- > ${P}.patch
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- 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
- echo "#define PERF_VERSION \"${MY_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
- # into the kernel, so it wants an ARCH that looks like the kernel arch,
- # but it also wants to know about the split value -- i386/x86_64 vs just
- # x86. We can get that by telling the func to use an older linux version.
- # It's kind of a hack, but not that bad ...
-
- # LIBDIR sets a search path of perf-gtk.so. Bug 515954
-
- local arch=$(tc-arch-kernel)
- local java_dir
- use java && java_dir="/etc/java-config-2/current-system-vm"
- # FIXME: NO_CORESIGHT
- # FIXME: NO_LIBBABELTRACE
- emake V=1 VF=1 \
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \
- prefix="${EPREFIX}/usr" bindir_relative="bin" \
- EXTRA_CFLAGS="${CFLAGS}" \
- ARCH="${arch}" \
- JDIR="${java_dir}" \
- LIBCLANGLLVM=$(usex clang 1 "") \
- NO_AUXTRACE="" \
- NO_BACKTRACE="" \
- NO_CORESIGHT=1 \
- NO_DEMANGLE=$(puse demangle) \
- NO_GTK2=$(puse gtk) \
- NO_JVMTI=$(puse java) \
- NO_LIBAUDIT=$(puse audit) \
- NO_LIBBABELTRACE=1 \
- NO_LIBBIONIC=1 \
- NO_LIBBPF="" \
- NO_LIBCRYPTO=$(puse crypt) \
- NO_LIBDW_DWARF_UNWIND="" \
- NO_LIBELF="" \
- NO_LIBNUMA=$(puse numa) \
- NO_LIBPERL=$(puse perl) \
- NO_LIBPYTHON=$(puse python) \
- NO_LIBUNWIND=$(puse unwind) \
- NO_SDT=$(puse systemtap) \
- NO_SLANG=$(puse slang) \
- NO_LZMA=$(puse lzma) \
- NO_ZLIB= \
- WERROR=0 \
- LIBDIR="/usr/libexec/perf-core" \
- "$@"
-}
-
-src_compile() {
- # test-clang.bin not build with g++
- if use clang; then
- pushd "${S_K}/tools/build/feature/" || die
- make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
- popd
- fi
- perf_make -f Makefile.perf
- use doc && perf_make -C Documentation
-}
-
-src_test() {
- :
-}
-
-src_install() {
- _install_python_ext() {
- perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
- }
-
- perf_make -f Makefile.perf install DESTDIR="${D}"
- if use python; then
- python_foreach_impl _install_python_ext
- fi
-
- rm -rv "${ED}"/usr/share/doc/perf-tip || die
-
- if use gtk; then
- mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
- "${ED}"/usr/libexec/perf-core || die
- fi
-
- dodoc CREDITS
-
- dodoc *txt Documentation/*.txt
- if use doc ; then
- HTML_DOCS="Documentation/*.html" einstalldocs
- doman Documentation/*.1
- fi
-}
-
-pkg_postinst() {
- if ! use doc ; then
- elog "Without the doc USE flag you won't get any documentation nor man pages."
- elog "And without man pages, you won't get any --help output for perf and its"
- elog "sub-tools."
- fi
-}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2020-08-26 2:41 Yixun Lan
0 siblings, 0 replies; 141+ messages in thread
From: Yixun Lan @ 2020-08-26 2:41 UTC (permalink / raw
To: gentoo-commits
commit: 104358c40eb6d5666b9c54de27a83b5241804dea
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 02:38:17 2020 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 02:40:58 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=104358c4
dev-util/perf: version bump, 5.8
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
dev-util/perf/Manifest | 1 +
dev-util/perf/perf-5.8.ebuild | 237 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 238 insertions(+)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 52d6fa24d91..dbb9d798847 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -3,6 +3,7 @@ DIST linux-4.20.tar.xz 104257836 BLAKE2B fb52cad2897da319299486fa8c3b9415cd0aee0
DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
DIST linux-5.6.tar.xz 111785252 BLAKE2B 8dbe02a8ca7fd3dcf512a15c5d8098c1e7f94257e65173fed43fcc45480e4ab790df8cd39bbbb4e2a21dc9a00385bc9bbe98215a31e7f7e1d9c8f21cd8ace69e SHA512 80846fe2b4e4a7ff471d2dde28a8216ae807a3209f959e93d39ea4fc9a189ea28ec3db9d303b3fe15a28c2cb90e7446876678e93e23353c2d6f262e364a06bc9
DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f5d2c58b6137d383f16034a587225a75a9dbca6a01a433056ebe078487132c224e909a2971c9634687e47b1d1 SHA512 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
+DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
DIST patch-4.14.33.xz 905284 BLAKE2B e67bd9a96708aaaf65eb0aa852493b2323c9e237bfcc6fa837f795e481943ead3e2d5005ee72e40fc247df01c50877d9da3848a05aba3c999c3cfb7678cbdbc9 SHA512 5c76be5171709c2df7df7d5a8e8f3d0f7ede47b433da3b0f1710f262c8fcf5cf6c744a96d4336ea397c2c88a5f0a7507a5ab08c7c82f08deeb7a6f887ad77cfd
DIST patch-4.20.3.xz 91732 BLAKE2B bf99271bcb35508df239343fd6c9d57c246f88320b586e44e2d97771d08b249a24db230214d4957015a5ed35261e201f0680101b99d0e92f0f1f69bc53e21458 SHA512 47178b8e3bfe4ba09cb82bb1ce8b0742e6749d4be3412fb57518918f7109e74eac1d3d8eb32a43e21b3837a14f37d5eefd8cab819defd10cc2db61fb0ceddeaf
DIST patch-5.4.20.xz 776552 BLAKE2B bad2a95ed8521ac5c379fe91e16d60b2a38de19b9239755084621e5230677b232ec4cf9e2e8161c0022daff43fdbb37d5b5b5bfdc9e932ef3a860bcd17f640f8 SHA512 65fbcdbd41e35c17601ff15bbe33933be2ab7a694aa181a0b802cc11c1c653c9b688dbb382076cbad05983a0c07467955c035ae25f5175f7ce5bc24339303d77
diff --git a/dev-util/perf/perf-5.8.ebuild b/dev-util/perf/perf-5.8.ebuild
new file mode 100644
index 00000000000..d0b9058a60c
--- /dev/null
+++ b/dev-util/perf/perf-5.8.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit bash-completion-r1 estack eutils llvm toolchain-funcs prefix python-r1 linux-info
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+ LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+ PATCH_VERSION=$(ver_cut 1-3)
+ LINUX_PATCH=patch-${PV//_/-}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+ https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ ${PV} == *.*.* ]] ; then
+ # stable-release series
+ LINUX_VER=$(ver_cut 1-2)
+ LINUX_PATCH=patch-${PV}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+ LINUX_VER=${PV}
+ SRC_URI=""
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit clang crypt debug +demangle +doc gtk java lzma numa perl python slang systemtap unwind zlib"
+# TODO babeltrace
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="audit? ( sys-process/audit )
+ crypt? ( dev-libs/openssl:0= )
+ clang? (
+ <sys-devel/clang-10:*
+ <sys-devel/llvm-10:*
+ )
+ demangle? ( sys-libs/binutils-libs:= )
+ gtk? ( x11-libs/gtk+:2 )
+ java? ( virtual/jre:* )
+ lzma? ( app-arch/xz-utils )
+ numa? ( sys-process/numactl )
+ perl? ( dev-lang/perl:= )
+ python? ( ${PYTHON_DEPS} )
+ slang? ( sys-libs/slang )
+ systemtap? ( dev-util/systemtap )
+ 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"
+
+CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+
+pkg_setup() {
+ use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
+}
+
+src_unpack() {
+ local paths=(
+ tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
+ scripts include lib "arch/*/lib"
+ )
+
+ # We expect the tar implementation to support the -j option (both
+ # GNU tar and libarchive's tar support that).
+ echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+ tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+ "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ eshopts_push -o noglob
+ ebegin "Filtering partial source patch"
+ filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+ > ${P}.patch
+ eend $? || die "filterdiff failed"
+ eshopts_pop
+ fi
+
+ local a
+ for a in ${A}; do
+ [[ ${a} == ${LINUX_SOURCES} ]] && continue
+ [[ ${a} == ${LINUX_PATCH} ]] && continue
+ unpack ${a}
+ 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
+ echo "#define PERF_VERSION \"${MY_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
+ # into the kernel, so it wants an ARCH that looks like the kernel arch,
+ # but it also wants to know about the split value -- i386/x86_64 vs just
+ # x86. We can get that by telling the func to use an older linux version.
+ # It's kind of a hack, but not that bad ...
+
+ # LIBDIR sets a search path of perf-gtk.so. Bug 515954
+
+ local arch=$(tc-arch-kernel)
+ local java_dir
+ use java && java_dir="/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)" \
+ PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+ prefix="${EPREFIX}/usr" bindir_relative="bin" \
+ EXTRA_CFLAGS="${CFLAGS}" \
+ ARCH="${arch}" \
+ JDIR="${java_dir}" \
+ LIBCLANGLLVM=$(usex clang 1 "") \
+ NO_AUXTRACE="" \
+ NO_BACKTRACE="" \
+ NO_CORESIGHT=1 \
+ NO_DEMANGLE=$(puse demangle) \
+ NO_GTK2=$(puse gtk) \
+ NO_JVMTI=$(puse java) \
+ NO_LIBAUDIT=$(puse audit) \
+ NO_LIBBABELTRACE=1 \
+ NO_LIBBIONIC=1 \
+ NO_LIBBPF="" \
+ NO_LIBCRYPTO=$(puse crypt) \
+ NO_LIBDW_DWARF_UNWIND="" \
+ NO_LIBELF="" \
+ NO_LIBNUMA=$(puse numa) \
+ NO_LIBPERL=$(puse perl) \
+ NO_LIBPYTHON=$(puse python) \
+ NO_LIBUNWIND=$(puse unwind) \
+ NO_SDT=$(puse systemtap) \
+ NO_SLANG=$(puse slang) \
+ NO_LZMA=$(puse lzma) \
+ NO_ZLIB= \
+ WERROR=0 \
+ LIBDIR="/usr/libexec/perf-core" \
+ "$@"
+}
+
+src_compile() {
+ # test-clang.bin not build with g++
+ if use clang; then
+ pushd "${S_K}/tools/build/feature/" || die
+ make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
+ popd
+ fi
+ perf_make -f Makefile.perf
+ use doc && perf_make -C Documentation
+}
+
+src_test() {
+ :
+}
+
+src_install() {
+ _install_python_ext() {
+ perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
+ }
+
+ perf_make -f Makefile.perf install DESTDIR="${D}"
+ if use python; then
+ python_foreach_impl _install_python_ext
+ fi
+
+ rm -rv "${ED}"/usr/share/doc/perf-tip || die
+
+ if use gtk; then
+ mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
+ "${ED}"/usr/libexec/perf-core || die
+ fi
+
+ dodoc CREDITS
+
+ dodoc *txt Documentation/*.txt
+ if use doc ; then
+ HTML_DOCS="Documentation/*.html" einstalldocs
+ doman Documentation/*.1
+ fi
+}
+
+pkg_postinst() {
+ if ! use doc ; then
+ elog "Without the doc USE flag you won't get any documentation nor man pages."
+ elog "And without man pages, you won't get any --help output for perf and its"
+ elog "sub-tools."
+ fi
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2020-09-19 8:50 Michał Górny
0 siblings, 0 replies; 141+ messages in thread
From: Michał Górny @ 2020-09-19 8:50 UTC (permalink / raw
To: gentoo-commits
commit: f34990c76d636d2721b31e7ef41725940c6bc9a1
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 19 08:47:02 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Sep 19 08:50:49 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f34990c7
dev-util/perf: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-util/perf/Manifest | 4 -
dev-util/perf/perf-4.14.33-r1.ebuild | 185 -----------------------------
dev-util/perf/perf-4.20.3.ebuild | 223 -----------------------------------
3 files changed, 412 deletions(-)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 9066001b972..682b2319903 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,8 +1,4 @@
-DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
-DIST linux-4.20.tar.xz 104257836 BLAKE2B fb52cad2897da319299486fa8c3b9415cd0aee0842dbf353a5b269720dcb902db407bb55dd95a77b212dcb4a488c15363d561f3649d6bd16885561f2466d90b1 SHA512 e282399beea5da539701aed2bc131abd5bc74a970dcd344163e9d295106dfd700180e672ed546ae5e55bc6b9ac95efd5ca1de2039015c1b7a6fc9c01ea6583d4
DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f5d2c58b6137d383f16034a587225a75a9dbca6a01a433056ebe078487132c224e909a2971c9634687e47b1d1 SHA512 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
-DIST patch-4.14.33.xz 905284 BLAKE2B e67bd9a96708aaaf65eb0aa852493b2323c9e237bfcc6fa837f795e481943ead3e2d5005ee72e40fc247df01c50877d9da3848a05aba3c999c3cfb7678cbdbc9 SHA512 5c76be5171709c2df7df7d5a8e8f3d0f7ede47b433da3b0f1710f262c8fcf5cf6c744a96d4336ea397c2c88a5f0a7507a5ab08c7c82f08deeb7a6f887ad77cfd
-DIST patch-4.20.3.xz 91732 BLAKE2B bf99271bcb35508df239343fd6c9d57c246f88320b586e44e2d97771d08b249a24db230214d4957015a5ed35261e201f0680101b99d0e92f0f1f69bc53e21458 SHA512 47178b8e3bfe4ba09cb82bb1ce8b0742e6749d4be3412fb57518918f7109e74eac1d3d8eb32a43e21b3837a14f37d5eefd8cab819defd10cc2db61fb0ceddeaf
DIST patch-5.4.20.xz 776552 BLAKE2B bad2a95ed8521ac5c379fe91e16d60b2a38de19b9239755084621e5230677b232ec4cf9e2e8161c0022daff43fdbb37d5b5b5bfdc9e932ef3a860bcd17f640f8 SHA512 65fbcdbd41e35c17601ff15bbe33933be2ab7a694aa181a0b802cc11c1c653c9b688dbb382076cbad05983a0c07467955c035ae25f5175f7ce5bc24339303d77
diff --git a/dev-util/perf/perf-4.14.33-r1.ebuild b/dev-util/perf/perf-4.14.33-r1.ebuild
deleted file mode 100644
index 34c62791ba6..00000000000
--- a/dev-util/perf/perf-4.14.33-r1.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit bash-completion-r1 estack eutils toolchain-funcs python-single-r1 linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
- LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
- PATCH_VERSION=$(ver_cut 1-3)
- LINUX_PATCH=patch-${PV//_/-}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
- https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ ${PV} == *.*.* ]] ; then
- # stable-release series
- LINUX_VER=$(ver_cut 1-2)
- LINUX_PATCH=patch-${PV}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
- LINUX_VER=${PV}
- SRC_URI=""
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit debug +demangle +doc gtk numa perl python slang unwind"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
- demangle? ( sys-libs/binutils-libs:= )
- gtk? ( x11-libs/gtk+:2 )
- numa? ( sys-process/numactl )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- slang? ( dev-libs/newt )
- unwind? ( sys-libs/libunwind )
- dev-libs/elfutils"
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-4.9
- ${LINUX_PATCH+dev-util/patchutils}
- sys-devel/bison
- sys-devel/flex
- 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"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-pkg_setup() {
- linux-info_pkg_setup
- use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
- local paths=(
- tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
- include lib "arch/*/lib"
- )
-
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
- > ${P}.patch || die
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- done
-}
-
-src_prepare() {
- default
- if [[ -n ${LINUX_PATCH} ]] ; then
- cd "${S_K}"
- eapply "${WORKDIR}"/${P}.patch
- 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
- echo "#define PERF_VERSION \"${MY_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' {} +
-}
-
-puse() { usex $1 "" no; }
-perf_make() {
- # The arch parsing is a bit funky. The perf tools package is integrated
- # into the kernel, so it wants an ARCH that looks like the kernel arch,
- # but it also wants to know about the split value -- i386/x86_64 vs just
- # x86. We can get that by telling the func to use an older linux version.
- # It's kind of a hack, but not that bad ...
-
- # LIBDIR sets a search path of perf-gtk.so. Bug 515954
-
- local arch=$(tc-arch-kernel)
- emake V=1 \
- CC="$(tc-getCC)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
- prefix="${EPREFIX}/usr" bindir_relative="bin" \
- EXTRA_CFLAGS="${CFLAGS}" \
- ARCH="${arch}" \
- NO_DEMANGLE=$(puse demangle) \
- NO_GTK2=$(puse gtk) \
- NO_LIBAUDIT=$(puse audit) \
- NO_LIBPERL=$(puse perl) \
- NO_LIBPYTHON=$(puse python) \
- NO_LIBUNWIND=$(puse unwind) \
- NO_NEWT=$(puse slang) \
- NO_LIBNUMA=$(puse numa) \
- WERROR=0 \
- LIBDIR="/usr/libexec/perf-core" \
- "$@"
-}
-
-src_compile() {
- perf_make -f Makefile.perf
- use doc && perf_make -C Documentation
-}
-
-src_test() {
- :
-}
-
-src_install() {
- perf_make -f Makefile.perf install DESTDIR="${D}"
-
- if use gtk; then
- mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
- "${ED}"/usr/libexec/perf-core || die
- fi
-
- dodoc CREDITS
-
- dodoc *txt Documentation/*.txt
- if use doc ; then
- HTML_DOCS="Documentation/*.html" einstalldocs
- doman Documentation/*.1
- fi
-}
-
-pkg_postinst() {
- if ! use doc ; then
- elog "Without the doc USE flag you won't get any documentation nor man pages."
- elog "And without man pages, you won't get any --help output for perf and its"
- elog "sub-tools."
- fi
-}
diff --git a/dev-util/perf/perf-4.20.3.ebuild b/dev-util/perf/perf-4.20.3.ebuild
deleted file mode 100644
index a366266a3ad..00000000000
--- a/dev-util/perf/perf-4.20.3.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit bash-completion-r1 estack eutils toolchain-funcs python-single-r1 linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
- LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
- PATCH_VERSION=$(ver_cut 1-3)
- LINUX_PATCH=patch-${PV//_/-}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
- https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ ${PV} == *.*.* ]] ; then
- # stable-release series
- LINUX_VER=$(ver_cut 1-2)
- LINUX_PATCH=patch-${PV}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
- LINUX_VER=${PV}
- SRC_URI=""
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit clang crypt debug +demangle +doc gtk java lzma numa perl python slang systemtap unwind zlib"
-# TODO babeltrace
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
- crypt? ( dev-libs/openssl:0= )
- clang? (
- sys-devel/clang:*
- sys-devel/llvm:*
- )
- demangle? ( sys-libs/binutils-libs:= )
- gtk? ( x11-libs/gtk+:2 )
- java? ( virtual/jre:* )
- lzma? ( app-arch/xz-utils )
- numa? ( sys-process/numactl )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- slang? ( sys-libs/slang )
- systemtap? ( dev-util/systemtap )
- 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"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-pkg_setup() {
- linux-info_pkg_setup
- use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
- local paths=(
- tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
- include lib "arch/*/lib"
- )
-
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
- > ${P}.patch
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- done
-}
-
-src_prepare() {
- default
- if [[ -n ${LINUX_PATCH} ]] ; then
- cd "${S_K}"
- eapply "${WORKDIR}"/${P}.patch
- 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
- echo "#define PERF_VERSION \"${MY_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' {} +
-}
-
-puse() { usex $1 "" no; }
-perf_make() {
- # The arch parsing is a bit funky. The perf tools package is integrated
- # into the kernel, so it wants an ARCH that looks like the kernel arch,
- # but it also wants to know about the split value -- i386/x86_64 vs just
- # x86. We can get that by telling the func to use an older linux version.
- # It's kind of a hack, but not that bad ...
-
- # LIBDIR sets a search path of perf-gtk.so. Bug 515954
-
- local arch=$(tc-arch-kernel)
- local java_dir
- use java && java_dir="/etc/java-config-2/current-system-vm"
- # FIXME: NO_CORESIGHT
- # FIXME: NO_LIBBABELTRACE
- emake V=1 VF=1 \
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
- prefix="${EPREFIX}/usr" bindir_relative="bin" \
- EXTRA_CFLAGS="${CFLAGS}" \
- ARCH="${arch}" \
- JDIR="${java_dir}" \
- LIBCLANGLLVM=$(usex clang 1 "") \
- NO_AUXTRACE="" \
- NO_BACKTRACE="" \
- NO_CORESIGHT=1 \
- NO_DEMANGLE=$(puse demangle) \
- NO_GTK2=$(puse gtk) \
- NO_JVMTI=$(puse java) \
- NO_LIBAUDIT=$(puse audit) \
- NO_LIBBABELTRACE=1 \
- NO_LIBBIONIC=1 \
- NO_LIBBPF="" \
- NO_LIBCRYPTO=$(puse crypt) \
- NO_LIBDW_DWARF_UNWIND="" \
- NO_LIBELF="" \
- NO_LIBNUMA=$(puse numa) \
- NO_LIBPERL=$(puse perl) \
- NO_LIBPYTHON=$(puse python) \
- NO_LIBUNWIND=$(puse unwind) \
- NO_SDT=$(puse systemtap) \
- NO_SLANG=$(puse slang) \
- NO_LZMA=$(puse lzma) \
- NO_ZLIB= \
- WERROR=0 \
- LIBDIR="/usr/libexec/perf-core" \
- "$@"
-}
-
-src_compile() {
- # test-clang.bin not build with g++
- if use clang; then
- pushd "${S_K}/tools/build/feature/" || die
- make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
- popd
- fi
- perf_make -f Makefile.perf
- use doc && perf_make -C Documentation
-}
-
-src_test() {
- :
-}
-
-src_install() {
- perf_make -f Makefile.perf install DESTDIR="${D}"
-
- rm -rv "${ED}"/usr/share/doc/perf-tip || die
-
- if use gtk; then
- mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
- "${ED}"/usr/libexec/perf-core || die
- fi
-
- dodoc CREDITS
-
- dodoc *txt Documentation/*.txt
- if use doc ; then
- HTML_DOCS="Documentation/*.html" einstalldocs
- doman Documentation/*.1
- fi
-}
-
-pkg_postinst() {
- if ! use doc ; then
- elog "Without the doc USE flag you won't get any documentation nor man pages."
- elog "And without man pages, you won't get any --help output for perf and its"
- elog "sub-tools."
- fi
-}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2020-10-26 3:29 Georgy Yakovlev
0 siblings, 0 replies; 141+ messages in thread
From: Georgy Yakovlev @ 2020-10-26 3:29 UTC (permalink / raw
To: gentoo-commits
commit: bc646c2c7045aab36289966bf1e6e77597efe25a
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 26 03:26:38 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 03:29:05 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc646c2c
dev-util/perf: fix gtk on ppc64
on behalf of ppc64 arch team
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
dev-util/perf/perf-5.8.ebuild | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-5.8.ebuild b/dev-util/perf/perf-5.8.ebuild
index d0b9058a60c..2395cf24d1f 100644
--- a/dev-util/perf/perf-5.8.ebuild
+++ b/dev-util/perf/perf-5.8.ebuild
@@ -215,7 +215,11 @@ src_install() {
rm -rv "${ED}"/usr/share/doc/perf-tip || die
if use gtk; then
- mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
+ local libdir
+ libdir="$(get_libdir)"
+ # on some arches it ends up in lib even on 64bit, ppc64 for instance.
+ [[ "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
+ mv "${ED}"/usr/${libdir}/libperf-gtk.so \
"${ED}"/usr/libexec/perf-core || die
fi
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2020-10-28 20:27 Georgy Yakovlev
0 siblings, 0 replies; 141+ messages in thread
From: Georgy Yakovlev @ 2020-10-28 20:27 UTC (permalink / raw
To: gentoo-commits
commit: 5a5935d1854c439c6eba0c3072e77111e45d3107
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 28 20:27:19 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Oct 28 20:27:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a5935d1
dev-util/perf: fix gtk fix
sorry, missed -f
Closes: https://bugs.gentoo.org/751376
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
dev-util/perf/perf-5.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-5.8.ebuild b/dev-util/perf/perf-5.8.ebuild
index 2395cf24d1f..b7df33f4c96 100644
--- a/dev-util/perf/perf-5.8.ebuild
+++ b/dev-util/perf/perf-5.8.ebuild
@@ -218,7 +218,7 @@ src_install() {
local libdir
libdir="$(get_libdir)"
# on some arches it ends up in lib even on 64bit, ppc64 for instance.
- [[ "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
+ [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
mv "${ED}"/usr/${libdir}/libperf-gtk.so \
"${ED}"/usr/libexec/perf-core || die
fi
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2020-11-19 15:36 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2020-11-19 15:36 UTC (permalink / raw
To: gentoo-commits
commit: 00459fb387d26c67a97d5bea5ac88ec202c78c11
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 10:16:14 2020 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 15:36:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00459fb3
dev-util/perf: fix formatting of metadata.xml
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/metadata.xml | 74 +++++++++++++++++++++++-----------------------
1 file changed, 37 insertions(+), 37 deletions(-)
diff --git a/dev-util/perf/metadata.xml b/dev-util/perf/metadata.xml
index 6755b763251..5bdf684d507 100644
--- a/dev-util/perf/metadata.xml
+++ b/dev-util/perf/metadata.xml
@@ -1,41 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>naota@gentoo.org</email>
- </maintainer>
- <maintainer type="person">
- <email>dlan@gentoo.org</email>
- <name>Yixun Lan</name>
- </maintainer>
- <maintainer type="person">
- <email>amadio@gentoo.org</email>
- <name>Guilherme Amadio</name>
- </maintainer>
- <use>
- <flag name="clang">Enable builtin clang and LLVM support</flag>
- <flag name="demangle">
- Enable C++ symbol name demangling, using libbfd from
- <pkg>sys-devel/binutils</pkg>. When this flag is enabled, the
- package will have to be rebuilt after every version bump of
- binutils.
- </flag>
- <flag name="doc">
- Build documentation and man pages. With this USE flag disabled,
- the --help parameter for perf and its sub-tools will not be
- available. This is optional because it depends on a few
- documentation handling tools that are not always welcome on user
- systems.
- </flag>
- <flag name="numa">Enable NUMA support</flag>
- <flag name="perl">
- Add support for Perl as a scripting language for perf tools.
- </flag>
- <flag name="systemtap">
- Add support to define SDT event in perf tools.
- </flag>
- <flag name="unwind">
- Use sys-libs/libunwind for frame unwinding support.
- </flag>
- </use>
+ <maintainer type="person">
+ <email>naota@gentoo.org</email>
+ </maintainer>
+ <maintainer type="person">
+ <email>dlan@gentoo.org</email>
+ <name>Yixun Lan</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>amadio@gentoo.org</email>
+ <name>Guilherme Amadio</name>
+ </maintainer>
+ <use>
+ <flag name="clang">Enable builtin clang and LLVM support</flag>
+ <flag name="demangle">
+ Enable C++ symbol name demangling, using libbfd from
+ <pkg>sys-devel/binutils</pkg>. When this flag is enabled, the
+ package will have to be rebuilt after every version bump of
+ binutils.
+ </flag>
+ <flag name="doc">
+ Build documentation and man pages. With this USE flag disabled,
+ the --help parameter for perf and its sub-tools will not be
+ available. This is optional because it depends on a few
+ documentation handling tools that are not always welcome on user
+ systems.
+ </flag>
+ <flag name="numa">Enable NUMA support</flag>
+ <flag name="perl">
+ Add support for Perl as a scripting language for perf tools.
+ </flag>
+ <flag name="systemtap">
+ Add support to define SDT event in perf tools.
+ </flag>
+ <flag name="unwind">
+ Use sys-libs/libunwind for frame unwinding support.
+ </flag>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2020-11-19 15:36 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2020-11-19 15:36 UTC (permalink / raw
To: gentoo-commits
commit: c2716da2764b18e49eecbf61c4864a5cc0da8d72
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 15:20:33 2020 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 15:36:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2716da2
dev-util/perf: version bump to 5.9.9
Add support for libpfm
Fix perf version command
Fix installation of tips.txt
Move warning about USE=-doc to pkg_pretend
Move build dependencies to BDEPEND
Closes: https://bugs.gentoo.org/588152
Closes: https://bugs.gentoo.org/618790
Closes: https://bugs.gentoo.org/731106
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/Manifest | 2 +
dev-util/perf/metadata.xml | 1 +
dev-util/perf/perf-5.9.9.ebuild | 246 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 249 insertions(+)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 682b2319903..9d23c4e598b 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,4 +1,6 @@
DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f5d2c58b6137d383f16034a587225a75a9dbca6a01a433056ebe078487132c224e909a2971c9634687e47b1d1 SHA512 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
+DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
DIST patch-5.4.20.xz 776552 BLAKE2B bad2a95ed8521ac5c379fe91e16d60b2a38de19b9239755084621e5230677b232ec4cf9e2e8161c0022daff43fdbb37d5b5b5bfdc9e932ef3a860bcd17f640f8 SHA512 65fbcdbd41e35c17601ff15bbe33933be2ab7a694aa181a0b802cc11c1c653c9b688dbb382076cbad05983a0c07467955c035ae25f5175f7ce5bc24339303d77
+DIST patch-5.9.9.xz 502816 BLAKE2B 104fa2ecaac3c543662b891de22cb881a917320317d58dcaeb6b6826e3f0296126ab5177cc7a44a438c15d3ae9cab116ff6926cce9d5e4d310df99fca0d9b909 SHA512 87852bc4d08cd5e82c7de9a8c8d50c1b4c67eed7157bfe1034d279370ff21a194f082f126d49812f84ec726100c5d97b3d908994e92c2cbfd231a4ac851babe3
diff --git a/dev-util/perf/metadata.xml b/dev-util/perf/metadata.xml
index 5bdf684d507..279962a1a52 100644
--- a/dev-util/perf/metadata.xml
+++ b/dev-util/perf/metadata.xml
@@ -27,6 +27,7 @@
documentation handling tools that are not always welcome on user
systems.
</flag>
+ <flag name="libpfm">Enable <pkg>dev-libs/libpfm</pkg> support</flag>
<flag name="numa">Enable NUMA support</flag>
<flag name="perl">
Add support for Perl as a scripting language for perf tools.
diff --git a/dev-util/perf/perf-5.9.9.ebuild b/dev-util/perf/perf-5.9.9.ebuild
new file mode 100644
index 00000000000..a0feac7cb31
--- /dev/null
+++ b/dev-util/perf/perf-5.9.9.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit bash-completion-r1 estack eutils llvm toolchain-funcs prefix python-r1 linux-info
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+ LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+ PATCH_VERSION=$(ver_cut 1-3)
+ LINUX_PATCH=patch-${PV//_/-}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+ https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ ${PV} == *.*.* ]] ; then
+ # stable-release series
+ LINUX_VER=$(ver_cut 1-2)
+ LINUX_PATCH=patch-${PV}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+ LINUX_VER=${PV}
+ SRC_URI=""
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit clang crypt debug +demangle +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib"
+# TODO babeltrace
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="audit? ( sys-process/audit )
+ crypt? ( dev-libs/openssl:0= )
+ clang? (
+ <sys-devel/clang-10:*
+ <sys-devel/llvm-10:*
+ )
+ demangle? ( sys-libs/binutils-libs:= )
+ gtk? ( x11-libs/gtk+:2 )
+ java? ( virtual/jre:* )
+ libpfm? ( dev-libs/libpfm )
+ lzma? ( app-arch/xz-utils )
+ numa? ( sys-process/numactl )
+ perl? ( dev-lang/perl:= )
+ python? ( ${PYTHON_DEPS} )
+ slang? ( sys-libs/slang )
+ systemtap? ( dev-util/systemtap )
+ 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"
+
+CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+
+pkg_pretend() {
+ if ! use doc ; then
+ ewarn "Without the doc USE flag you won't get any documentation nor man pages."
+ ewarn "And without man pages, you won't get any --help output for perf and its"
+ ewarn "sub-tools."
+ fi
+}
+
+pkg_setup() {
+ use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
+}
+
+src_unpack() {
+ local paths=(
+ tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
+ scripts include lib "arch/*/lib"
+ )
+
+ # We expect the tar implementation to support the -j option (both
+ # GNU tar and libarchive's tar support that).
+ echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+ tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+ "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ eshopts_push -o noglob
+ ebegin "Filtering partial source patch"
+ filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+ > ${P}.patch
+ eend $? || die "filterdiff failed"
+ eshopts_pop
+ fi
+
+ local a
+ for a in ${A}; do
+ [[ ${a} == ${LINUX_SOURCES} ]] && continue
+ [[ ${a} == ${LINUX_PATCH} ]] && continue
+ unpack ${a}
+ done
+}
+
+puse() { usex $1 "" no; }
+perf_make() {
+ # The arch parsing is a bit funky. The perf tools package is integrated
+ # into the kernel, so it wants an ARCH that looks like the kernel arch,
+ # but it also wants to know about the split value -- i386/x86_64 vs just
+ # x86. We can get that by telling the func to use an older linux version.
+ # It's kind of a hack, but not that bad ...
+
+ # LIBDIR sets a search path of perf-gtk.so. Bug 515954
+
+ local arch=$(tc-arch-kernel)
+ 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)" \
+ PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+ prefix="${EPREFIX}/usr" bindir_relative="bin" \
+ tipdir="share/doc/${PF}" \
+ EXTRA_CFLAGS="${CFLAGS}" \
+ ARCH="${arch}" \
+ JDIR="${java_dir}" \
+ LIBCLANGLLVM=$(usex clang 1 "") \
+ LIBPFM4=$(usex libpfm 1 "") \
+ NO_AUXTRACE="" \
+ NO_BACKTRACE="" \
+ NO_CORESIGHT=1 \
+ NO_DEMANGLE=$(puse demangle) \
+ NO_GTK2=$(puse gtk) \
+ feature-gtk2-infobar=$(usex gtk 1 "") \
+ NO_JVMTI=$(puse java) \
+ NO_LIBAUDIT=$(puse audit) \
+ NO_LIBBABELTRACE=1 \
+ NO_LIBBIONIC=1 \
+ NO_LIBBPF= \
+ NO_LIBCRYPTO=$(puse crypt) \
+ NO_LIBDW_DWARF_UNWIND= \
+ NO_LIBELF= \
+ NO_LIBNUMA=$(puse numa) \
+ NO_LIBPERL=$(puse perl) \
+ NO_LIBPYTHON=$(puse python) \
+ NO_LIBUNWIND=$(puse unwind) \
+ NO_SDT=$(puse systemtap) \
+ NO_SLANG=$(puse slang) \
+ NO_LZMA=$(puse lzma) \
+ NO_ZLIB= \
+ WERROR=0 \
+ LIBDIR="/usr/libexec/perf-core" \
+ "$@"
+}
+
+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
+ pushd "${S_K}/tools/build/feature/" || die
+ make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
+ popd
+ fi
+ perf_make -f Makefile.perf
+ use doc && perf_make -C Documentation
+}
+
+src_test() {
+ :
+}
+
+src_install() {
+ _install_python_ext() {
+ perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
+ }
+
+ perf_make -f Makefile.perf install DESTDIR="${D}"
+
+ if use python; then
+ python_foreach_impl _install_python_ext
+ fi
+
+ if use gtk; then
+ local libdir
+ libdir="$(get_libdir)"
+ # on some arches it ends up in lib even on 64bit, ppc64 for instance.
+ [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
+ mv "${ED}"/usr/${libdir}/libperf-gtk.so \
+ "${ED}"/usr/libexec/perf-core || die
+ fi
+
+ dodoc CREDITS
+
+ dodoc *txt Documentation/*.txt
+
+ # perf needs this decompressed to print out tips for users
+ docompress -x /usr/share/doc/${PF}/tips.txt
+
+ if use doc ; then
+ HTML_DOCS="Documentation/*.html" einstalldocs
+ doman Documentation/*.1
+ fi
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2020-11-19 16:10 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2020-11-19 16:10 UTC (permalink / raw
To: gentoo-commits
commit: dbdd161a2caa8e6c45aee32bfa4454d614b61b9b
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 16:09:08 2020 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> 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 <amadio <AT> 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
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2020-12-18 10:14 Sergei Trofimovich
0 siblings, 0 replies; 141+ messages in thread
From: Sergei Trofimovich @ 2020-12-18 10:14 UTC (permalink / raw
To: gentoo-commits
commit: 2a241ad65e297bcc185d2d68279162457444f641
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 18 10:14:00 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Dec 18 10:14:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a241ad6
dev-util/perf: keyworded 5.9.9 for ppc
keyworded wrt bug #759754
Package-Manager: Portage-3.0.12, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-util/perf/perf-5.9.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-5.9.9.ebuild b/dev-util/perf/perf-5.9.9.ebuild
index 4ab143e4afe..0b729ff3cc0 100644
--- a/dev-util/perf/perf-5.9.9.ebuild
+++ b/dev-util/perf/perf-5.9.9.ebuild
@@ -31,7 +31,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 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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"
# TODO babeltrace
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2021-02-06 21:33 Sam James
0 siblings, 0 replies; 141+ messages in thread
From: Sam James @ 2021-02-06 21:33 UTC (permalink / raw
To: gentoo-commits
commit: 80021431801184c01735b89a024b79f8de1f1c4a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 6 21:33:45 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 6 21:33:45 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80021431
dev-util/perf: move patchutils to BDEPEND
Closes: https://bugs.gentoo.org/731106
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/perf/perf-5.9.9.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-util/perf/perf-5.9.9.ebuild b/dev-util/perf/perf-5.9.9.ebuild
index 4b9cf226554..6fc372d7c68 100644
--- a/dev-util/perf/perf-5.9.9.ebuild
+++ b/dev-util/perf/perf-5.9.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -37,6 +37,7 @@ IUSE="audit clang crypt debug +demangle +doc gtk java libpfm lzma numa perl pyth
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
BDEPEND="
+ ${LINUX_PATCH+dev-util/patchutils}
sys-devel/bison
sys-devel/flex
doc? (
@@ -68,7 +69,6 @@ RDEPEND="audit? ( sys-process/audit )
DEPEND="${RDEPEND}
>=sys-kernel/linux-headers-4.19
- ${LINUX_PATCH+dev-util/patchutils}
java? ( virtual/jdk )
"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2021-02-15 14:58 Yixun Lan
0 siblings, 0 replies; 141+ messages in thread
From: Yixun Lan @ 2021-02-15 14:58 UTC (permalink / raw
To: gentoo-commits
commit: c16d3f9ed1800475c3b58c64d5b4ceba19de707c
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 15 14:46:52 2021 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 14:46:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c16d3f9e
dev-util/perf: version bump, for 5.{10,11}.x
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
dev-util/perf/Manifest | 3 +
dev-util/perf/perf-5.10.16.ebuild | 250 ++++++++++++++++++++++++++++++++++++++
dev-util/perf/perf-5.11.ebuild | 250 ++++++++++++++++++++++++++++++++++++++
3 files changed, 503 insertions(+)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 9d23c4e598b..09d2ab2a720 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,6 +1,9 @@
+DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
+DIST linux-5.11.tar.xz 117619104 BLAKE2B 81300c27bd5476387a83123aaeb4163c73eb61e9245806c23660cb5e6a4fa88ffc9def027031335fa0270fc4080506cd415990014364e3a98b9d2e8c58a29524 SHA512 a567ec133018bb5ec00c60281479b466c26e02137a93a9c690e83997947df02b6fd94e76e8df748f6d70ceb58a19bacc3b1467de10b7a1fad2763db32b3f1330
DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f5d2c58b6137d383f16034a587225a75a9dbca6a01a433056ebe078487132c224e909a2971c9634687e47b1d1 SHA512 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
+DIST patch-5.10.16.xz 498880 BLAKE2B 14061b505285f24938fb955ccc7f9fbd78ccc0b1026bffb17a89fdad08ea54bfee7bbb841123d9af4d0720a960a27c649c39852af7e2be8a286af926c7bce9c0 SHA512 be9cfe1ae6697956ca7476cedc212a8cbd9da2c3c72096a89afaaf73c5b6655fd04d458f96c472f680c5513c0ea3e4449c4092a958425b6040f0c7774453cd2f
DIST patch-5.4.20.xz 776552 BLAKE2B bad2a95ed8521ac5c379fe91e16d60b2a38de19b9239755084621e5230677b232ec4cf9e2e8161c0022daff43fdbb37d5b5b5bfdc9e932ef3a860bcd17f640f8 SHA512 65fbcdbd41e35c17601ff15bbe33933be2ab7a694aa181a0b802cc11c1c653c9b688dbb382076cbad05983a0c07467955c035ae25f5175f7ce5bc24339303d77
DIST patch-5.9.9.xz 502816 BLAKE2B 104fa2ecaac3c543662b891de22cb881a917320317d58dcaeb6b6826e3f0296126ab5177cc7a44a438c15d3ae9cab116ff6926cce9d5e4d310df99fca0d9b909 SHA512 87852bc4d08cd5e82c7de9a8c8d50c1b4c67eed7157bfe1034d279370ff21a194f082f126d49812f84ec726100c5d97b3d908994e92c2cbfd231a4ac851babe3
diff --git a/dev-util/perf/perf-5.10.16.ebuild b/dev-util/perf/perf-5.10.16.ebuild
new file mode 100644
index 00000000000..57147178746
--- /dev/null
+++ b/dev-util/perf/perf-5.10.16.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+inherit bash-completion-r1 estack eutils llvm toolchain-funcs prefix python-r1 linux-info
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+ LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+ PATCH_VERSION=$(ver_cut 1-3)
+ LINUX_PATCH=patch-${PV//_/-}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+ https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ ${PV} == *.*.* ]] ; then
+ # stable-release series
+ LINUX_VER=$(ver_cut 1-2)
+ LINUX_PATCH=patch-${PV}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+ LINUX_VER=${PV}
+ SRC_URI=""
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+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"
+# TODO babeltrace
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="
+ ${LINUX_PATCH+dev-util/patchutils}
+ 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? (
+ <sys-devel/clang-10:*
+ <sys-devel/llvm-10:*
+ )
+ demangle? ( sys-libs/binutils-libs:= )
+ gtk? ( x11-libs/gtk+:2 )
+ java? ( virtual/jre:* )
+ libpfm? ( dev-libs/libpfm )
+ lzma? ( app-arch/xz-utils )
+ numa? ( sys-process/numactl )
+ perl? ( dev-lang/perl:= )
+ python? ( ${PYTHON_DEPS} )
+ slang? ( sys-libs/slang )
+ systemtap? ( dev-util/systemtap )
+ unwind? ( sys-libs/libunwind )
+ zlib? ( sys-libs/zlib )
+ dev-libs/elfutils"
+
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-4.19
+ java? ( virtual/jdk )
+"
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
+CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+
+pkg_pretend() {
+ if ! use doc ; then
+ ewarn "Without the doc USE flag you won't get any documentation nor man pages."
+ ewarn "And without man pages, you won't get any --help output for perf and its"
+ ewarn "sub-tools."
+ fi
+}
+
+pkg_setup() {
+ use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
+}
+
+src_unpack() {
+ local paths=(
+ tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
+ scripts include lib "arch/*/lib"
+ )
+
+ # We expect the tar implementation to support the -j option (both
+ # GNU tar and libarchive's tar support that).
+ echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+ tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+ "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ eshopts_push -o noglob
+ ebegin "Filtering partial source patch"
+ filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+ > ${P}.patch
+ eend $? || die "filterdiff failed"
+ eshopts_pop
+ fi
+
+ local a
+ for a in ${A}; do
+ [[ ${a} == ${LINUX_SOURCES} ]] && continue
+ [[ ${a} == ${LINUX_PATCH} ]] && continue
+ unpack ${a}
+ 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
+ # into the kernel, so it wants an ARCH that looks like the kernel arch,
+ # but it also wants to know about the split value -- i386/x86_64 vs just
+ # x86. We can get that by telling the func to use an older linux version.
+ # It's kind of a hack, but not that bad ...
+
+ # LIBDIR sets a search path of perf-gtk.so. Bug 515954
+
+ local arch=$(tc-arch-kernel)
+ 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)" \
+ PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+ prefix="${EPREFIX}/usr" bindir_relative="bin" \
+ tipdir="share/doc/${PF}" \
+ EXTRA_CFLAGS="${CFLAGS}" \
+ ARCH="${arch}" \
+ JDIR="${java_dir}" \
+ LIBCLANGLLVM=$(usex clang 1 "") \
+ LIBPFM4=$(usex libpfm 1 "") \
+ NO_AUXTRACE="" \
+ NO_BACKTRACE="" \
+ NO_CORESIGHT=1 \
+ NO_DEMANGLE=$(puse demangle) \
+ GTK2=$(usex gtk 1 "") \
+ feature-gtk2-infobar=$(usex gtk 1 "") \
+ NO_JVMTI=$(puse java) \
+ NO_LIBAUDIT=$(puse audit) \
+ NO_LIBBABELTRACE=1 \
+ NO_LIBBIONIC=1 \
+ NO_LIBBPF= \
+ NO_LIBCRYPTO=$(puse crypt) \
+ NO_LIBDW_DWARF_UNWIND= \
+ NO_LIBELF= \
+ NO_LIBNUMA=$(puse numa) \
+ NO_LIBPERL=$(puse perl) \
+ NO_LIBPYTHON=$(puse python) \
+ NO_LIBUNWIND=$(puse unwind) \
+ NO_SDT=$(puse systemtap) \
+ NO_SLANG=$(puse slang) \
+ NO_LZMA=$(puse lzma) \
+ NO_ZLIB= \
+ WERROR=0 \
+ LIBDIR="/usr/libexec/perf-core" \
+ "$@"
+}
+
+src_compile() {
+ # test-clang.bin not build with g++
+ if use clang; then
+ pushd "${S_K}/tools/build/feature/" || die
+ make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
+ popd
+ fi
+ perf_make -f Makefile.perf
+ use doc && perf_make -C Documentation
+}
+
+src_test() {
+ :
+}
+
+src_install() {
+ _install_python_ext() {
+ perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
+ }
+
+ perf_make -f Makefile.perf install DESTDIR="${D}"
+
+ if use python; then
+ python_foreach_impl _install_python_ext
+ fi
+
+ if use gtk; then
+ local libdir
+ libdir="$(get_libdir)"
+ # on some arches it ends up in lib even on 64bit, ppc64 for instance.
+ [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
+ mv "${ED}"/usr/${libdir}/libperf-gtk.so \
+ "${ED}"/usr/libexec/perf-core || die
+ fi
+
+ dodoc CREDITS
+
+ dodoc *txt Documentation/*.txt
+
+ # perf needs this decompressed to print out tips for users
+ docompress -x /usr/share/doc/${PF}/tips.txt
+
+ if use doc ; then
+ HTML_DOCS="Documentation/*.html" einstalldocs
+ doman Documentation/*.1
+ fi
+}
diff --git a/dev-util/perf/perf-5.11.ebuild b/dev-util/perf/perf-5.11.ebuild
new file mode 100644
index 00000000000..57147178746
--- /dev/null
+++ b/dev-util/perf/perf-5.11.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+inherit bash-completion-r1 estack eutils llvm toolchain-funcs prefix python-r1 linux-info
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+ LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+ PATCH_VERSION=$(ver_cut 1-3)
+ LINUX_PATCH=patch-${PV//_/-}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+ https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ ${PV} == *.*.* ]] ; then
+ # stable-release series
+ LINUX_VER=$(ver_cut 1-2)
+ LINUX_PATCH=patch-${PV}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+ LINUX_VER=${PV}
+ SRC_URI=""
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+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"
+# TODO babeltrace
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="
+ ${LINUX_PATCH+dev-util/patchutils}
+ 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? (
+ <sys-devel/clang-10:*
+ <sys-devel/llvm-10:*
+ )
+ demangle? ( sys-libs/binutils-libs:= )
+ gtk? ( x11-libs/gtk+:2 )
+ java? ( virtual/jre:* )
+ libpfm? ( dev-libs/libpfm )
+ lzma? ( app-arch/xz-utils )
+ numa? ( sys-process/numactl )
+ perl? ( dev-lang/perl:= )
+ python? ( ${PYTHON_DEPS} )
+ slang? ( sys-libs/slang )
+ systemtap? ( dev-util/systemtap )
+ unwind? ( sys-libs/libunwind )
+ zlib? ( sys-libs/zlib )
+ dev-libs/elfutils"
+
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-4.19
+ java? ( virtual/jdk )
+"
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
+CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+
+pkg_pretend() {
+ if ! use doc ; then
+ ewarn "Without the doc USE flag you won't get any documentation nor man pages."
+ ewarn "And without man pages, you won't get any --help output for perf and its"
+ ewarn "sub-tools."
+ fi
+}
+
+pkg_setup() {
+ use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
+}
+
+src_unpack() {
+ local paths=(
+ tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
+ scripts include lib "arch/*/lib"
+ )
+
+ # We expect the tar implementation to support the -j option (both
+ # GNU tar and libarchive's tar support that).
+ echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+ tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+ "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ eshopts_push -o noglob
+ ebegin "Filtering partial source patch"
+ filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+ > ${P}.patch
+ eend $? || die "filterdiff failed"
+ eshopts_pop
+ fi
+
+ local a
+ for a in ${A}; do
+ [[ ${a} == ${LINUX_SOURCES} ]] && continue
+ [[ ${a} == ${LINUX_PATCH} ]] && continue
+ unpack ${a}
+ 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
+ # into the kernel, so it wants an ARCH that looks like the kernel arch,
+ # but it also wants to know about the split value -- i386/x86_64 vs just
+ # x86. We can get that by telling the func to use an older linux version.
+ # It's kind of a hack, but not that bad ...
+
+ # LIBDIR sets a search path of perf-gtk.so. Bug 515954
+
+ local arch=$(tc-arch-kernel)
+ 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)" \
+ PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+ prefix="${EPREFIX}/usr" bindir_relative="bin" \
+ tipdir="share/doc/${PF}" \
+ EXTRA_CFLAGS="${CFLAGS}" \
+ ARCH="${arch}" \
+ JDIR="${java_dir}" \
+ LIBCLANGLLVM=$(usex clang 1 "") \
+ LIBPFM4=$(usex libpfm 1 "") \
+ NO_AUXTRACE="" \
+ NO_BACKTRACE="" \
+ NO_CORESIGHT=1 \
+ NO_DEMANGLE=$(puse demangle) \
+ GTK2=$(usex gtk 1 "") \
+ feature-gtk2-infobar=$(usex gtk 1 "") \
+ NO_JVMTI=$(puse java) \
+ NO_LIBAUDIT=$(puse audit) \
+ NO_LIBBABELTRACE=1 \
+ NO_LIBBIONIC=1 \
+ NO_LIBBPF= \
+ NO_LIBCRYPTO=$(puse crypt) \
+ NO_LIBDW_DWARF_UNWIND= \
+ NO_LIBELF= \
+ NO_LIBNUMA=$(puse numa) \
+ NO_LIBPERL=$(puse perl) \
+ NO_LIBPYTHON=$(puse python) \
+ NO_LIBUNWIND=$(puse unwind) \
+ NO_SDT=$(puse systemtap) \
+ NO_SLANG=$(puse slang) \
+ NO_LZMA=$(puse lzma) \
+ NO_ZLIB= \
+ WERROR=0 \
+ LIBDIR="/usr/libexec/perf-core" \
+ "$@"
+}
+
+src_compile() {
+ # test-clang.bin not build with g++
+ if use clang; then
+ pushd "${S_K}/tools/build/feature/" || die
+ make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
+ popd
+ fi
+ perf_make -f Makefile.perf
+ use doc && perf_make -C Documentation
+}
+
+src_test() {
+ :
+}
+
+src_install() {
+ _install_python_ext() {
+ perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
+ }
+
+ perf_make -f Makefile.perf install DESTDIR="${D}"
+
+ if use python; then
+ python_foreach_impl _install_python_ext
+ fi
+
+ if use gtk; then
+ local libdir
+ libdir="$(get_libdir)"
+ # on some arches it ends up in lib even on 64bit, ppc64 for instance.
+ [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
+ mv "${ED}"/usr/${libdir}/libperf-gtk.so \
+ "${ED}"/usr/libexec/perf-core || die
+ fi
+
+ dodoc CREDITS
+
+ dodoc *txt Documentation/*.txt
+
+ # perf needs this decompressed to print out tips for users
+ docompress -x /usr/share/doc/${PF}/tips.txt
+
+ if use doc ; then
+ HTML_DOCS="Documentation/*.html" einstalldocs
+ doman Documentation/*.1
+ fi
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2021-02-17 9:37 David Seifert
0 siblings, 0 replies; 141+ messages in thread
From: David Seifert @ 2021-02-17 9:37 UTC (permalink / raw
To: gentoo-commits
commit: e48c05cc2494640eafafed683eee52dbcda683d0
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Wed Feb 17 09:36:13 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Feb 17 09:36:13 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e48c05cc
dev-util/perf: Remove old
* Does not build with gcc-10
Closes: https://bugs.gentoo.org/709406
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
dev-util/perf/Manifest | 3 -
dev-util/perf/perf-5.4.20.ebuild | 246 ---------------------------------------
dev-util/perf/perf-5.7-r1.ebuild | 237 -------------------------------------
3 files changed, 486 deletions(-)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 09d2ab2a720..7742d4dac10 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,9 +1,6 @@
DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
DIST linux-5.11.tar.xz 117619104 BLAKE2B 81300c27bd5476387a83123aaeb4163c73eb61e9245806c23660cb5e6a4fa88ffc9def027031335fa0270fc4080506cd415990014364e3a98b9d2e8c58a29524 SHA512 a567ec133018bb5ec00c60281479b466c26e02137a93a9c690e83997947df02b6fd94e76e8df748f6d70ceb58a19bacc3b1467de10b7a1fad2763db32b3f1330
-DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f5d2c58b6137d383f16034a587225a75a9dbca6a01a433056ebe078487132c224e909a2971c9634687e47b1d1 SHA512 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
DIST patch-5.10.16.xz 498880 BLAKE2B 14061b505285f24938fb955ccc7f9fbd78ccc0b1026bffb17a89fdad08ea54bfee7bbb841123d9af4d0720a960a27c649c39852af7e2be8a286af926c7bce9c0 SHA512 be9cfe1ae6697956ca7476cedc212a8cbd9da2c3c72096a89afaaf73c5b6655fd04d458f96c472f680c5513c0ea3e4449c4092a958425b6040f0c7774453cd2f
-DIST patch-5.4.20.xz 776552 BLAKE2B bad2a95ed8521ac5c379fe91e16d60b2a38de19b9239755084621e5230677b232ec4cf9e2e8161c0022daff43fdbb37d5b5b5bfdc9e932ef3a860bcd17f640f8 SHA512 65fbcdbd41e35c17601ff15bbe33933be2ab7a694aa181a0b802cc11c1c653c9b688dbb382076cbad05983a0c07467955c035ae25f5175f7ce5bc24339303d77
DIST patch-5.9.9.xz 502816 BLAKE2B 104fa2ecaac3c543662b891de22cb881a917320317d58dcaeb6b6826e3f0296126ab5177cc7a44a438c15d3ae9cab116ff6926cce9d5e4d310df99fca0d9b909 SHA512 87852bc4d08cd5e82c7de9a8c8d50c1b4c67eed7157bfe1034d279370ff21a194f082f126d49812f84ec726100c5d97b3d908994e92c2cbfd231a4ac851babe3
diff --git a/dev-util/perf/perf-5.4.20.ebuild b/dev-util/perf/perf-5.4.20.ebuild
deleted file mode 100644
index 23fa3098706..00000000000
--- a/dev-util/perf/perf-5.4.20.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-inherit bash-completion-r1 estack eutils toolchain-funcs python-r1 linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
- LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
- PATCH_VERSION=$(ver_cut 1-3)
- LINUX_PATCH=patch-${PV//_/-}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
- https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ ${PV} == *.*.* ]] ; then
- # stable-release series
- LINUX_VER=$(ver_cut 1-2)
- LINUX_PATCH=patch-${PV}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
- LINUX_VER=${PV}
- SRC_URI=""
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit clang crypt debug +demangle +doc gtk java lzma numa perl python slang systemtap unwind zlib"
-# TODO babeltrace
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
- crypt? ( dev-libs/openssl:0= )
- clang? (
- sys-devel/clang:*
- sys-devel/llvm:*
- )
- demangle? ( sys-libs/binutils-libs:= )
- gtk? ( x11-libs/gtk+:2 )
- java? ( virtual/jre:* )
- lzma? ( app-arch/xz-utils )
- numa? ( sys-process/numactl )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- slang? ( sys-libs/slang )
- systemtap? ( dev-util/systemtap )
- 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"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-src_unpack() {
- local paths=(
- tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
- include lib "arch/*/lib"
- )
-
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
- > ${P}.patch
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- done
-
- # support clang8
- echo $(clang-major-version)
- if use clang; then
- local old_CC=${CC}
- CC=${CHOST}-clang
- if [[ $(clang-major-version) -ge 8 ]]; then
- pushd "${S_K}" >/dev/null || die
- eapply \
- "${FILESDIR}/perf-5.1.15-fix-clang8.patch" \
- "${FILESDIR}/perf-5.4.6-fix-clang9.patch"
- popd || die
- fi
- CC=${old_CC}
- fi
-
- pushd "${S_K}" >/dev/null || die
- eapply "${FILESDIR}/perf-5.4.7-propagate-cflags.patch"
- eapply "${FILESDIR}/perf-5.4.20-binutil-libs-2.34.patch"
- popd || die
-}
-
-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
- echo "#define PERF_VERSION \"${MY_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' {} +
-}
-
-puse() { usex $1 "" no; }
-perf_make() {
- # The arch parsing is a bit funky. The perf tools package is integrated
- # into the kernel, so it wants an ARCH that looks like the kernel arch,
- # but it also wants to know about the split value -- i386/x86_64 vs just
- # x86. We can get that by telling the func to use an older linux version.
- # It's kind of a hack, but not that bad ...
-
- # LIBDIR sets a search path of perf-gtk.so. Bug 515954
-
- local arch=$(tc-arch-kernel)
- local java_dir
- use java && java_dir="/etc/java-config-2/current-system-vm"
- # FIXME: NO_CORESIGHT
- # FIXME: NO_LIBBABELTRACE
- emake V=1 VF=1 \
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
- prefix="${EPREFIX}/usr" bindir_relative="bin" \
- EXTRA_CFLAGS="${CFLAGS}" \
- ARCH="${arch}" \
- JDIR="${java_dir}" \
- LIBCLANGLLVM=$(usex clang 1 "") \
- NO_AUXTRACE="" \
- NO_BACKTRACE="" \
- NO_CORESIGHT=1 \
- NO_DEMANGLE=$(puse demangle) \
- NO_GTK2=$(puse gtk) \
- NO_JVMTI=$(puse java) \
- NO_LIBAUDIT=$(puse audit) \
- NO_LIBBABELTRACE=1 \
- NO_LIBBIONIC=1 \
- NO_LIBBPF="" \
- NO_LIBCRYPTO=$(puse crypt) \
- NO_LIBDW_DWARF_UNWIND="" \
- NO_LIBELF="" \
- NO_LIBNUMA=$(puse numa) \
- NO_LIBPERL=$(puse perl) \
- NO_LIBPYTHON=$(puse python) \
- NO_LIBUNWIND=$(puse unwind) \
- NO_SDT=$(puse systemtap) \
- NO_SLANG=$(puse slang) \
- NO_LZMA=$(puse lzma) \
- NO_ZLIB= \
- WERROR=0 \
- LIBDIR="/usr/libexec/perf-core" \
- "$@"
-}
-
-src_compile() {
- # test-clang.bin not build with g++
- if use clang; then
- pushd "${S_K}/tools/build/feature/" || die
- make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
- popd
- fi
- perf_make -f Makefile.perf
- use doc && perf_make -C Documentation
-}
-
-src_test() {
- :
-}
-
-src_install() {
- _install_python_ext() {
- perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
- }
-
- perf_make -f Makefile.perf install DESTDIR="${D}"
- if use python; then
- python_foreach_impl _install_python_ext
- fi
-
- rm -rv "${ED}"/usr/share/doc/perf-tip || die
-
- if use gtk; then
- mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
- "${ED}"/usr/libexec/perf-core || die
- fi
-
- dodoc CREDITS
-
- dodoc *txt Documentation/*.txt
- if use doc ; then
- HTML_DOCS="Documentation/*.html" einstalldocs
- doman Documentation/*.1
- fi
-}
-
-pkg_postinst() {
- if ! use doc ; then
- elog "Without the doc USE flag you won't get any documentation nor man pages."
- elog "And without man pages, you won't get any --help output for perf and its"
- elog "sub-tools."
- fi
-}
diff --git a/dev-util/perf/perf-5.7-r1.ebuild b/dev-util/perf/perf-5.7-r1.ebuild
deleted file mode 100644
index a954d845b70..00000000000
--- a/dev-util/perf/perf-5.7-r1.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit bash-completion-r1 estack eutils llvm toolchain-funcs prefix python-r1 linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
- LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
- PATCH_VERSION=$(ver_cut 1-3)
- LINUX_PATCH=patch-${PV//_/-}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
- https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ ${PV} == *.*.* ]] ; then
- # stable-release series
- LINUX_VER=$(ver_cut 1-2)
- LINUX_PATCH=patch-${PV}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
- LINUX_VER=${PV}
- SRC_URI=""
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit clang crypt debug +demangle +doc gtk java lzma numa perl python slang systemtap unwind zlib"
-# TODO babeltrace
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
- crypt? ( dev-libs/openssl:0= )
- clang? (
- <sys-devel/clang-10:*
- <sys-devel/llvm-10:*
- )
- demangle? ( sys-libs/binutils-libs:= )
- gtk? ( x11-libs/gtk+:2 )
- java? ( virtual/jre:* )
- lzma? ( app-arch/xz-utils )
- numa? ( sys-process/numactl )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- slang? ( sys-libs/slang )
- systemtap? ( dev-util/systemtap )
- 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"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-pkg_setup() {
- use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
-}
-
-src_unpack() {
- local paths=(
- tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
- scripts include lib "arch/*/lib"
- )
-
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
- > ${P}.patch
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- 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
- echo "#define PERF_VERSION \"${MY_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
- # into the kernel, so it wants an ARCH that looks like the kernel arch,
- # but it also wants to know about the split value -- i386/x86_64 vs just
- # x86. We can get that by telling the func to use an older linux version.
- # It's kind of a hack, but not that bad ...
-
- # LIBDIR sets a search path of perf-gtk.so. Bug 515954
-
- local arch=$(tc-arch-kernel)
- local java_dir
- use java && java_dir="/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)" \
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \
- prefix="${EPREFIX}/usr" bindir_relative="bin" \
- EXTRA_CFLAGS="${CFLAGS}" \
- ARCH="${arch}" \
- JDIR="${java_dir}" \
- LIBCLANGLLVM=$(usex clang 1 "") \
- NO_AUXTRACE="" \
- NO_BACKTRACE="" \
- NO_CORESIGHT=1 \
- NO_DEMANGLE=$(puse demangle) \
- NO_GTK2=$(puse gtk) \
- NO_JVMTI=$(puse java) \
- NO_LIBAUDIT=$(puse audit) \
- NO_LIBBABELTRACE=1 \
- NO_LIBBIONIC=1 \
- NO_LIBBPF="" \
- NO_LIBCRYPTO=$(puse crypt) \
- NO_LIBDW_DWARF_UNWIND="" \
- NO_LIBELF="" \
- NO_LIBNUMA=$(puse numa) \
- NO_LIBPERL=$(puse perl) \
- NO_LIBPYTHON=$(puse python) \
- NO_LIBUNWIND=$(puse unwind) \
- NO_SDT=$(puse systemtap) \
- NO_SLANG=$(puse slang) \
- NO_LZMA=$(puse lzma) \
- NO_ZLIB= \
- WERROR=0 \
- LIBDIR="/usr/libexec/perf-core" \
- "$@"
-}
-
-src_compile() {
- # test-clang.bin not build with g++
- if use clang; then
- pushd "${S_K}/tools/build/feature/" || die
- make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
- popd
- fi
- perf_make -f Makefile.perf
- use doc && perf_make -C Documentation
-}
-
-src_test() {
- :
-}
-
-src_install() {
- _install_python_ext() {
- perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
- }
-
- perf_make -f Makefile.perf install DESTDIR="${D}"
- if use python; then
- python_foreach_impl _install_python_ext
- fi
-
- rm -rv "${ED}"/usr/share/doc/perf-tip || die
-
- if use gtk; then
- mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
- "${ED}"/usr/libexec/perf-core || die
- fi
-
- dodoc CREDITS
-
- dodoc *txt Documentation/*.txt
- if use doc ; then
- HTML_DOCS="Documentation/*.html" einstalldocs
- doman Documentation/*.1
- fi
-}
-
-pkg_postinst() {
- if ! use doc ; then
- elog "Without the doc USE flag you won't get any documentation nor man pages."
- elog "And without man pages, you won't get any --help output for perf and its"
- elog "sub-tools."
- fi
-}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2021-03-03 10:24 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2021-03-03 10:24 UTC (permalink / raw
To: gentoo-commits
commit: c8f16976c02e15fed57e40aa4c6449691c3a3766
Author: 12101111 <w12101111 <AT> gmail <DOT> com>
AuthorDate: Wed Mar 3 06:59:26 2021 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Wed Mar 3 10:22:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8f16976
dev-util/perf: fix libdir
Closes: https://bugs.gentoo.org/774006
Closes: https://github.com/gentoo/gentoo/pull/19746
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Han PuYu <w12101111 <AT> gmail.com>
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/perf-5.10.16.ebuild | 1 +
dev-util/perf/perf-5.11.ebuild | 1 +
dev-util/perf/perf-5.8.ebuild | 3 ++-
dev-util/perf/perf-5.9.9.ebuild | 1 +
4 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-5.10.16.ebuild b/dev-util/perf/perf-5.10.16.ebuild
index 57147178746..eda4faf8ef8 100644
--- a/dev-util/perf/perf-5.10.16.ebuild
+++ b/dev-util/perf/perf-5.10.16.ebuild
@@ -198,6 +198,7 @@ perf_make() {
NO_ZLIB= \
WERROR=0 \
LIBDIR="/usr/libexec/perf-core" \
+ libdir="${EPREFIX}/usr/$(get_libdir)" \
"$@"
}
diff --git a/dev-util/perf/perf-5.11.ebuild b/dev-util/perf/perf-5.11.ebuild
index 57147178746..eda4faf8ef8 100644
--- a/dev-util/perf/perf-5.11.ebuild
+++ b/dev-util/perf/perf-5.11.ebuild
@@ -198,6 +198,7 @@ perf_make() {
NO_ZLIB= \
WERROR=0 \
LIBDIR="/usr/libexec/perf-core" \
+ libdir="${EPREFIX}/usr/$(get_libdir)" \
"$@"
}
diff --git a/dev-util/perf/perf-5.8.ebuild b/dev-util/perf/perf-5.8.ebuild
index 98e5a27536a..60411320375 100644
--- a/dev-util/perf/perf-5.8.ebuild
+++ b/dev-util/perf/perf-5.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -184,6 +184,7 @@ perf_make() {
NO_ZLIB= \
WERROR=0 \
LIBDIR="/usr/libexec/perf-core" \
+ libdir="${EPREFIX}/usr/$(get_libdir)" \
"$@"
}
diff --git a/dev-util/perf/perf-5.9.9.ebuild b/dev-util/perf/perf-5.9.9.ebuild
index 6fc372d7c68..251cfd4abb8 100644
--- a/dev-util/perf/perf-5.9.9.ebuild
+++ b/dev-util/perf/perf-5.9.9.ebuild
@@ -198,6 +198,7 @@ perf_make() {
NO_ZLIB= \
WERROR=0 \
LIBDIR="/usr/libexec/perf-core" \
+ libdir="${EPREFIX}/usr/$(get_libdir)" \
"$@"
}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2021-04-24 8:07 Sergei Trofimovich
0 siblings, 0 replies; 141+ messages in thread
From: Sergei Trofimovich @ 2021-04-24 8:07 UTC (permalink / raw
To: gentoo-commits
commit: 1fc204c353e4abe8bb90aa5d59790e3af4586bbf
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 24 08:06:17 2021 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Apr 24 08:07:42 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fc204c3
dev-util/perf: unconditionally require build-time python
libbpf generates it's API headers using python script.
As ebuild enabled libbpf inconditionally we need python
at build time unconditionally as well.
Reported-by: Agostino Sarubbo
Closes: https://bugs.gentoo.org/765397
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-util/perf/perf-5.11.ebuild | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-5.11.ebuild b/dev-util/perf/perf-5.11.ebuild
index 5bcbb7413e9..92f4c1ae43f 100644
--- a/dev-util/perf/perf-5.11.ebuild
+++ b/dev-util/perf/perf-5.11.ebuild
@@ -46,7 +46,9 @@ BDEPEND="
app-text/sgml-common
app-text/xmlto
sys-process/time
- )"
+ )
+ ${PYTHON_DEPS}
+"
RDEPEND="audit? ( sys-process/audit )
crypt? ( dev-libs/openssl:0= )
@@ -88,6 +90,9 @@ pkg_pretend() {
pkg_setup() {
use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
+ # We enable python unconditionally as libbpf always generates
+ # API headers using python script
+ python_setup
}
src_unpack() {
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2021-04-30 9:12 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2021-04-30 9:12 UTC (permalink / raw
To: gentoo-commits
commit: 489caf5c81ff86a759107390ac7c626840c07752
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 30 08:59:06 2021 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 09:00:50 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=489caf5c
dev-util/perf: version bump to 5.12
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/Manifest | 1 +
dev-util/perf/perf-5.12.ebuild | 257 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 258 insertions(+)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 7742d4dac10..f52fc704996 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,5 +1,6 @@
DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
DIST linux-5.11.tar.xz 117619104 BLAKE2B 81300c27bd5476387a83123aaeb4163c73eb61e9245806c23660cb5e6a4fa88ffc9def027031335fa0270fc4080506cd415990014364e3a98b9d2e8c58a29524 SHA512 a567ec133018bb5ec00c60281479b466c26e02137a93a9c690e83997947df02b6fd94e76e8df748f6d70ceb58a19bacc3b1467de10b7a1fad2763db32b3f1330
+DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
DIST patch-5.10.16.xz 498880 BLAKE2B 14061b505285f24938fb955ccc7f9fbd78ccc0b1026bffb17a89fdad08ea54bfee7bbb841123d9af4d0720a960a27c649c39852af7e2be8a286af926c7bce9c0 SHA512 be9cfe1ae6697956ca7476cedc212a8cbd9da2c3c72096a89afaaf73c5b6655fd04d458f96c472f680c5513c0ea3e4449c4092a958425b6040f0c7774453cd2f
diff --git a/dev-util/perf/perf-5.12.ebuild b/dev-util/perf/perf-5.12.ebuild
new file mode 100644
index 00000000000..411cb28ecd2
--- /dev/null
+++ b/dev-util/perf/perf-5.12.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit bash-completion-r1 estack llvm toolchain-funcs prefix python-r1 linux-info
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+ LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+ PATCH_VERSION=$(ver_cut 1-3)
+ LINUX_PATCH=patch-${PV//_/-}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+ https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ ${PV} == *.*.* ]] ; then
+ # stable-release series
+ LINUX_VER=$(ver_cut 1-2)
+ LINUX_PATCH=patch-${PV}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+ LINUX_VER=${PV}
+ SRC_URI=""
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+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"
+# TODO babeltrace
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="
+ ${LINUX_PATCH+dev-util/patchutils}
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+ doc? (
+ app-text/asciidoc
+ app-text/sgml-common
+ app-text/xmlto
+ sys-process/time
+ )
+ ${PYTHON_DEPS}
+"
+
+RDEPEND="audit? ( sys-process/audit )
+ crypt? ( dev-libs/openssl:0= )
+ clang? (
+ <sys-devel/clang-10:*
+ <sys-devel/llvm-10:*
+ )
+ demangle? ( sys-libs/binutils-libs:= )
+ gtk? ( x11-libs/gtk+:2 )
+ java? ( virtual/jre:* )
+ libpfm? ( dev-libs/libpfm )
+ lzma? ( app-arch/xz-utils )
+ numa? ( sys-process/numactl )
+ perl? ( dev-lang/perl:= )
+ python? ( ${PYTHON_DEPS} )
+ slang? ( sys-libs/slang )
+ systemtap? ( dev-util/systemtap )
+ unwind? ( sys-libs/libunwind )
+ zlib? ( sys-libs/zlib )
+ dev-libs/elfutils"
+
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-4.19
+ java? ( virtual/jdk )
+"
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
+CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+
+pkg_pretend() {
+ if ! use doc ; then
+ ewarn "Without the doc USE flag you won't get any documentation nor man pages."
+ ewarn "And without man pages, you won't get any --help output for perf and its"
+ ewarn "sub-tools."
+ fi
+}
+
+pkg_setup() {
+ use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
+ # We enable python unconditionally as libbpf always generates
+ # API headers using python script
+ python_setup
+}
+
+src_unpack() {
+ local paths=(
+ tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
+ scripts include lib "arch/*/lib"
+ )
+
+ # We expect the tar implementation to support the -j option (both
+ # GNU tar and libarchive's tar support that).
+ echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+ tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+ "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ eshopts_push -o noglob
+ ebegin "Filtering partial source patch"
+ filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+ > ${P}.patch
+ eend $? || die "filterdiff failed"
+ eshopts_pop
+ fi
+
+ local a
+ for a in ${A}; do
+ [[ ${a} == ${LINUX_SOURCES} ]] && continue
+ [[ ${a} == ${LINUX_PATCH} ]] && continue
+ unpack ${a}
+ 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
+ # into the kernel, so it wants an ARCH that looks like the kernel arch,
+ # but it also wants to know about the split value -- i386/x86_64 vs just
+ # x86. We can get that by telling the func to use an older linux version.
+ # It's kind of a hack, but not that bad ...
+
+ # LIBDIR sets a search path of perf-gtk.so. Bug 515954
+
+ local arch=$(tc-arch-kernel)
+ 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)" \
+ PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+ prefix="${EPREFIX}/usr" bindir_relative="bin" \
+ tipdir="share/doc/${PF}" \
+ EXTRA_CFLAGS="${CFLAGS}" \
+ ARCH="${arch}" \
+ JDIR="${java_dir}" \
+ LIBCLANGLLVM=$(usex clang 1 "") \
+ LIBPFM4=$(usex libpfm 1 "") \
+ NO_AUXTRACE="" \
+ NO_BACKTRACE="" \
+ NO_CORESIGHT=1 \
+ NO_DEMANGLE=$(puse demangle) \
+ GTK2=$(usex gtk 1 "") \
+ feature-gtk2-infobar=$(usex gtk 1 "") \
+ NO_JVMTI=$(puse java) \
+ NO_LIBAUDIT=$(puse audit) \
+ NO_LIBBABELTRACE=1 \
+ NO_LIBBIONIC=1 \
+ NO_LIBBPF= \
+ NO_LIBCRYPTO=$(puse crypt) \
+ NO_LIBDW_DWARF_UNWIND= \
+ NO_LIBELF= \
+ NO_LIBNUMA=$(puse numa) \
+ NO_LIBPERL=$(puse perl) \
+ NO_LIBPYTHON=$(puse python) \
+ NO_LIBUNWIND=$(puse unwind) \
+ NO_SDT=$(puse systemtap) \
+ NO_SLANG=$(puse slang) \
+ NO_LZMA=$(puse lzma) \
+ NO_ZLIB= \
+ WERROR=0 \
+ LIBDIR="/usr/libexec/perf-core" \
+ libdir="${EPREFIX}/usr/$(get_libdir)" \
+ "$@"
+}
+
+src_compile() {
+ # test-clang.bin not build with g++
+ if use clang; then
+ pushd "${S_K}/tools/build/feature/" || die
+ make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
+ popd
+ fi
+ perf_make -f Makefile.perf
+ use doc && perf_make -C Documentation
+}
+
+src_test() {
+ :
+}
+
+src_install() {
+ _install_python_ext() {
+ perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
+ }
+
+ perf_make -f Makefile.perf install DESTDIR="${D}"
+
+ if use python; then
+ python_foreach_impl _install_python_ext
+ fi
+
+ if use gtk; then
+ local libdir
+ libdir="$(get_libdir)"
+ # on some arches it ends up in lib even on 64bit, ppc64 for instance.
+ [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
+ mv "${ED}"/usr/${libdir}/libperf-gtk.so \
+ "${ED}"/usr/libexec/perf-core || die
+ fi
+
+ dodoc CREDITS
+
+ dodoc *txt Documentation/*.txt
+
+ # perf needs this decompressed to print out tips for users
+ docompress -x /usr/share/doc/${PF}/tips.txt
+
+ if use doc ; then
+ HTML_DOCS="Documentation/*.html" einstalldocs
+ doman Documentation/*.1
+ fi
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2021-04-30 9:12 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2021-04-30 9:12 UTC (permalink / raw
To: gentoo-commits
commit: 2d6af4f61aabf31b899bc7facb2e0f5b77ed0035
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 30 09:10:47 2021 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 09:10:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d6af4f6
dev-util/perf: fix file collision with trace-cmd, bug #738404
Closes: https://bugs.gentoo.org/738404
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/perf-5.11.ebuild | 1 +
dev-util/perf/perf-5.12.ebuild | 1 +
dev-util/perf/perf-5.8.ebuild | 1 +
3 files changed, 3 insertions(+)
diff --git a/dev-util/perf/perf-5.11.ebuild b/dev-util/perf/perf-5.11.ebuild
index 92f4c1ae43f..979b7517199 100644
--- a/dev-util/perf/perf-5.11.ebuild
+++ b/dev-util/perf/perf-5.11.ebuild
@@ -205,6 +205,7 @@ perf_make() {
WERROR=0 \
LIBDIR="/usr/libexec/perf-core" \
libdir="${EPREFIX}/usr/$(get_libdir)" \
+ plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins" \
"$@"
}
diff --git a/dev-util/perf/perf-5.12.ebuild b/dev-util/perf/perf-5.12.ebuild
index 411cb28ecd2..ad940b16bba 100644
--- a/dev-util/perf/perf-5.12.ebuild
+++ b/dev-util/perf/perf-5.12.ebuild
@@ -205,6 +205,7 @@ perf_make() {
WERROR=0 \
LIBDIR="/usr/libexec/perf-core" \
libdir="${EPREFIX}/usr/$(get_libdir)" \
+ plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins" \
"$@"
}
diff --git a/dev-util/perf/perf-5.8.ebuild b/dev-util/perf/perf-5.8.ebuild
index 83e1898c4db..38ceee391a8 100644
--- a/dev-util/perf/perf-5.8.ebuild
+++ b/dev-util/perf/perf-5.8.ebuild
@@ -186,6 +186,7 @@ perf_make() {
WERROR=0 \
LIBDIR="/usr/libexec/perf-core" \
libdir="${EPREFIX}/usr/$(get_libdir)" \
+ plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins" \
"$@"
}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2021-04-30 9:12 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2021-04-30 9:12 UTC (permalink / raw
To: gentoo-commits
commit: 8673d705805b0698007cb9fd46edf7ab9726056b
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 30 09:00:31 2021 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 09:00:50 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8673d705
dev-util/perf: drop old
Keep 5.8 as it's the last version to support alpha.
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/Manifest | 4 -
dev-util/perf/perf-5.10.16.ebuild | 252 --------------------------------------
dev-util/perf/perf-5.9.9.ebuild | 252 --------------------------------------
3 files changed, 508 deletions(-)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index f52fc704996..c1956dcd550 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,7 +1,3 @@
-DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
DIST linux-5.11.tar.xz 117619104 BLAKE2B 81300c27bd5476387a83123aaeb4163c73eb61e9245806c23660cb5e6a4fa88ffc9def027031335fa0270fc4080506cd415990014364e3a98b9d2e8c58a29524 SHA512 a567ec133018bb5ec00c60281479b466c26e02137a93a9c690e83997947df02b6fd94e76e8df748f6d70ceb58a19bacc3b1467de10b7a1fad2763db32b3f1330
DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
-DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
-DIST patch-5.10.16.xz 498880 BLAKE2B 14061b505285f24938fb955ccc7f9fbd78ccc0b1026bffb17a89fdad08ea54bfee7bbb841123d9af4d0720a960a27c649c39852af7e2be8a286af926c7bce9c0 SHA512 be9cfe1ae6697956ca7476cedc212a8cbd9da2c3c72096a89afaaf73c5b6655fd04d458f96c472f680c5513c0ea3e4449c4092a958425b6040f0c7774453cd2f
-DIST patch-5.9.9.xz 502816 BLAKE2B 104fa2ecaac3c543662b891de22cb881a917320317d58dcaeb6b6826e3f0296126ab5177cc7a44a438c15d3ae9cab116ff6926cce9d5e4d310df99fca0d9b909 SHA512 87852bc4d08cd5e82c7de9a8c8d50c1b4c67eed7157bfe1034d279370ff21a194f082f126d49812f84ec726100c5d97b3d908994e92c2cbfd231a4ac851babe3
diff --git a/dev-util/perf/perf-5.10.16.ebuild b/dev-util/perf/perf-5.10.16.ebuild
deleted file mode 100644
index 5bcbb7413e9..00000000000
--- a/dev-util/perf/perf-5.10.16.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit bash-completion-r1 estack llvm toolchain-funcs prefix python-r1 linux-info
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
- LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
- PATCH_VERSION=$(ver_cut 1-3)
- LINUX_PATCH=patch-${PV//_/-}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
- https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ ${PV} == *.*.* ]] ; then
- # stable-release series
- LINUX_VER=$(ver_cut 1-2)
- LINUX_PATCH=patch-${PV}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
- LINUX_VER=${PV}
- SRC_URI=""
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-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"
-# TODO babeltrace
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="
- ${LINUX_PATCH+dev-util/patchutils}
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- 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? (
- <sys-devel/clang-10:*
- <sys-devel/llvm-10:*
- )
- demangle? ( sys-libs/binutils-libs:= )
- gtk? ( x11-libs/gtk+:2 )
- java? ( virtual/jre:* )
- libpfm? ( dev-libs/libpfm )
- lzma? ( app-arch/xz-utils )
- numa? ( sys-process/numactl )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- slang? ( sys-libs/slang )
- systemtap? ( dev-util/systemtap )
- unwind? ( sys-libs/libunwind )
- zlib? ( sys-libs/zlib )
- dev-libs/elfutils"
-
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-4.19
- java? ( virtual/jdk )
-"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-pkg_pretend() {
- if ! use doc ; then
- ewarn "Without the doc USE flag you won't get any documentation nor man pages."
- ewarn "And without man pages, you won't get any --help output for perf and its"
- ewarn "sub-tools."
- fi
-}
-
-pkg_setup() {
- use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
-}
-
-src_unpack() {
- local paths=(
- tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
- scripts include lib "arch/*/lib"
- )
-
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
- > ${P}.patch
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- 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
- # into the kernel, so it wants an ARCH that looks like the kernel arch,
- # but it also wants to know about the split value -- i386/x86_64 vs just
- # x86. We can get that by telling the func to use an older linux version.
- # It's kind of a hack, but not that bad ...
-
- # LIBDIR sets a search path of perf-gtk.so. Bug 515954
-
- local arch=$(tc-arch-kernel)
- 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)" \
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \
- prefix="${EPREFIX}/usr" bindir_relative="bin" \
- tipdir="share/doc/${PF}" \
- EXTRA_CFLAGS="${CFLAGS}" \
- ARCH="${arch}" \
- JDIR="${java_dir}" \
- LIBCLANGLLVM=$(usex clang 1 "") \
- LIBPFM4=$(usex libpfm 1 "") \
- NO_AUXTRACE="" \
- NO_BACKTRACE="" \
- NO_CORESIGHT=1 \
- NO_DEMANGLE=$(puse demangle) \
- GTK2=$(usex gtk 1 "") \
- feature-gtk2-infobar=$(usex gtk 1 "") \
- NO_JVMTI=$(puse java) \
- NO_LIBAUDIT=$(puse audit) \
- NO_LIBBABELTRACE=1 \
- NO_LIBBIONIC=1 \
- NO_LIBBPF= \
- NO_LIBCRYPTO=$(puse crypt) \
- NO_LIBDW_DWARF_UNWIND= \
- NO_LIBELF= \
- NO_LIBNUMA=$(puse numa) \
- NO_LIBPERL=$(puse perl) \
- NO_LIBPYTHON=$(puse python) \
- NO_LIBUNWIND=$(puse unwind) \
- NO_SDT=$(puse systemtap) \
- NO_SLANG=$(puse slang) \
- NO_LZMA=$(puse lzma) \
- NO_ZLIB= \
- WERROR=0 \
- LIBDIR="/usr/libexec/perf-core" \
- libdir="${EPREFIX}/usr/$(get_libdir)" \
- "$@"
-}
-
-src_compile() {
- # test-clang.bin not build with g++
- if use clang; then
- pushd "${S_K}/tools/build/feature/" || die
- make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
- popd
- fi
- perf_make -f Makefile.perf
- use doc && perf_make -C Documentation
-}
-
-src_test() {
- :
-}
-
-src_install() {
- _install_python_ext() {
- perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
- }
-
- perf_make -f Makefile.perf install DESTDIR="${D}"
-
- if use python; then
- python_foreach_impl _install_python_ext
- fi
-
- if use gtk; then
- local libdir
- libdir="$(get_libdir)"
- # on some arches it ends up in lib even on 64bit, ppc64 for instance.
- [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
- mv "${ED}"/usr/${libdir}/libperf-gtk.so \
- "${ED}"/usr/libexec/perf-core || die
- fi
-
- dodoc CREDITS
-
- dodoc *txt Documentation/*.txt
-
- # perf needs this decompressed to print out tips for users
- docompress -x /usr/share/doc/${PF}/tips.txt
-
- if use doc ; then
- HTML_DOCS="Documentation/*.html" einstalldocs
- doman Documentation/*.1
- fi
-}
diff --git a/dev-util/perf/perf-5.9.9.ebuild b/dev-util/perf/perf-5.9.9.ebuild
deleted file mode 100644
index ade70b6a2fe..00000000000
--- a/dev-util/perf/perf-5.9.9.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit bash-completion-r1 estack llvm toolchain-funcs prefix python-r1 linux-info
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
- LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
- PATCH_VERSION=$(ver_cut 1-3)
- LINUX_PATCH=patch-${PV//_/-}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
- https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ ${PV} == *.*.* ]] ; then
- # stable-release series
- LINUX_VER=$(ver_cut 1-2)
- LINUX_PATCH=patch-${PV}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
- LINUX_VER=${PV}
- SRC_URI=""
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-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"
-# TODO babeltrace
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="
- ${LINUX_PATCH+dev-util/patchutils}
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- 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? (
- <sys-devel/clang-10:*
- <sys-devel/llvm-10:*
- )
- demangle? ( sys-libs/binutils-libs:= )
- gtk? ( x11-libs/gtk+:2 )
- java? ( virtual/jre:* )
- libpfm? ( dev-libs/libpfm )
- lzma? ( app-arch/xz-utils )
- numa? ( sys-process/numactl )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- slang? ( sys-libs/slang )
- systemtap? ( dev-util/systemtap )
- unwind? ( sys-libs/libunwind )
- zlib? ( sys-libs/zlib )
- dev-libs/elfutils"
-
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-4.19
- java? ( virtual/jdk )
-"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-pkg_pretend() {
- if ! use doc ; then
- ewarn "Without the doc USE flag you won't get any documentation nor man pages."
- ewarn "And without man pages, you won't get any --help output for perf and its"
- ewarn "sub-tools."
- fi
-}
-
-pkg_setup() {
- use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
-}
-
-src_unpack() {
- local paths=(
- tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
- scripts include lib "arch/*/lib"
- )
-
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
- > ${P}.patch
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- 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
- # into the kernel, so it wants an ARCH that looks like the kernel arch,
- # but it also wants to know about the split value -- i386/x86_64 vs just
- # x86. We can get that by telling the func to use an older linux version.
- # It's kind of a hack, but not that bad ...
-
- # LIBDIR sets a search path of perf-gtk.so. Bug 515954
-
- local arch=$(tc-arch-kernel)
- 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)" \
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \
- prefix="${EPREFIX}/usr" bindir_relative="bin" \
- tipdir="share/doc/${PF}" \
- EXTRA_CFLAGS="${CFLAGS}" \
- ARCH="${arch}" \
- JDIR="${java_dir}" \
- LIBCLANGLLVM=$(usex clang 1 "") \
- LIBPFM4=$(usex libpfm 1 "") \
- NO_AUXTRACE="" \
- NO_BACKTRACE="" \
- NO_CORESIGHT=1 \
- NO_DEMANGLE=$(puse demangle) \
- NO_GTK2=$(puse gtk) \
- feature-gtk2-infobar=$(usex gtk 1 "") \
- NO_JVMTI=$(puse java) \
- NO_LIBAUDIT=$(puse audit) \
- NO_LIBBABELTRACE=1 \
- NO_LIBBIONIC=1 \
- NO_LIBBPF= \
- NO_LIBCRYPTO=$(puse crypt) \
- NO_LIBDW_DWARF_UNWIND= \
- NO_LIBELF= \
- NO_LIBNUMA=$(puse numa) \
- NO_LIBPERL=$(puse perl) \
- NO_LIBPYTHON=$(puse python) \
- NO_LIBUNWIND=$(puse unwind) \
- NO_SDT=$(puse systemtap) \
- NO_SLANG=$(puse slang) \
- NO_LZMA=$(puse lzma) \
- NO_ZLIB= \
- WERROR=0 \
- LIBDIR="/usr/libexec/perf-core" \
- libdir="${EPREFIX}/usr/$(get_libdir)" \
- "$@"
-}
-
-src_compile() {
- # test-clang.bin not build with g++
- if use clang; then
- pushd "${S_K}/tools/build/feature/" || die
- make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
- popd
- fi
- perf_make -f Makefile.perf
- use doc && perf_make -C Documentation
-}
-
-src_test() {
- :
-}
-
-src_install() {
- _install_python_ext() {
- perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
- }
-
- perf_make -f Makefile.perf install DESTDIR="${D}"
-
- if use python; then
- python_foreach_impl _install_python_ext
- fi
-
- if use gtk; then
- local libdir
- libdir="$(get_libdir)"
- # on some arches it ends up in lib even on 64bit, ppc64 for instance.
- [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
- mv "${ED}"/usr/${libdir}/libperf-gtk.so \
- "${ED}"/usr/libexec/perf-core || die
- fi
-
- dodoc CREDITS
-
- dodoc *txt Documentation/*.txt
-
- # perf needs this decompressed to print out tips for users
- docompress -x /usr/share/doc/${PF}/tips.txt
-
- if use doc ; then
- HTML_DOCS="Documentation/*.html" einstalldocs
- doman Documentation/*.1
- fi
-}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2021-04-30 9:42 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2021-04-30 9:42 UTC (permalink / raw
To: gentoo-commits
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) \
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2021-05-01 8:07 Sergei Trofimovich
0 siblings, 0 replies; 141+ messages in thread
From: Sergei Trofimovich @ 2021-05-01 8:07 UTC (permalink / raw
To: gentoo-commits
commit: 0449b9f5493299e97f4a7556e21767a16a79abf3
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat May 1 08:06:36 2021 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat May 1 08:06:36 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0449b9f5
dev-util/perf: unconditionally apply PYTHON_REQUIRED_USE
Bug #765397 declared unconditional use of python at build time.
REQUIRED_USE needs to enforce that. Otherwise users could provide
incompatible python_* USEs and get late build failures.
Reported-by: Daniel M. Weeks
Bug: https://bugs.gentoo.org/765397
Closes: https://bugs.gentoo.org/787242
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-util/perf/perf-5.11.ebuild | 2 +-
dev-util/perf/perf-5.12.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-util/perf/perf-5.11.ebuild b/dev-util/perf/perf-5.11.ebuild
index 979b7517199..9de12cc7035 100644
--- a/dev-util/perf/perf-5.11.ebuild
+++ b/dev-util/perf/perf-5.11.ebuild
@@ -34,7 +34,7 @@ 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"
# TODO babeltrace
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
BDEPEND="
${LINUX_PATCH+dev-util/patchutils}
diff --git a/dev-util/perf/perf-5.12.ebuild b/dev-util/perf/perf-5.12.ebuild
index 9ca795b5dee..795634dc8cd 100644
--- a/dev-util/perf/perf-5.12.ebuild
+++ b/dev-util/perf/perf-5.12.ebuild
@@ -34,7 +34,7 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
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} )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
BDEPEND="
${LINUX_PATCH+dev-util/patchutils}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2021-05-22 18:55 Mikle Kolyada
0 siblings, 0 replies; 141+ messages in thread
From: Mikle Kolyada @ 2021-05-22 18:55 UTC (permalink / raw
To: gentoo-commits
commit: 1a4f789579c89b68d9219dd5a5a1f8fd79fff5b1
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat May 22 18:55:19 2021 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat May 22 18:55:19 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a4f7895
dev-util/perf: co-maintain
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
dev-util/perf/metadata.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/dev-util/perf/metadata.xml b/dev-util/perf/metadata.xml
index 18c5fbdc755..f9311842cd8 100644
--- a/dev-util/perf/metadata.xml
+++ b/dev-util/perf/metadata.xml
@@ -12,6 +12,10 @@
<email>amadio@gentoo.org</email>
<name>Guilherme Amadio</name>
</maintainer>
+ <maintainer type="person">
+ <email>zlogene@gentoo.org</email>
+ <name>Mikle Kolyada</name>
+ </maintainer>
<use>
<flag name="babeltrace">Enable <pkg>dev-util/babeltrace</pkg> support</flag>
<flag name="clang">Enable builtin clang and LLVM support</flag>
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2021-05-27 6:58 Mikle Kolyada
0 siblings, 0 replies; 141+ messages in thread
From: Mikle Kolyada @ 2021-05-27 6:58 UTC (permalink / raw
To: gentoo-commits
commit: 949d909dc561d47e5343aef0f029c7b1f50fdf88
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu May 27 06:57:32 2021 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu May 27 06:58:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=949d909d
dev-util/perf: restore perf-5.10.x
Needed for 5.10 kernel series
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
dev-util/perf/Manifest | 2 +
dev-util/perf/perf-5.10.16.ebuild | 250 ++++++++++++++++++++++++++++++++++++++
2 files changed, 252 insertions(+)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index c1956dcd550..58089a339b1 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,3 +1,5 @@
+DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
DIST linux-5.11.tar.xz 117619104 BLAKE2B 81300c27bd5476387a83123aaeb4163c73eb61e9245806c23660cb5e6a4fa88ffc9def027031335fa0270fc4080506cd415990014364e3a98b9d2e8c58a29524 SHA512 a567ec133018bb5ec00c60281479b466c26e02137a93a9c690e83997947df02b6fd94e76e8df748f6d70ceb58a19bacc3b1467de10b7a1fad2763db32b3f1330
DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
+DIST patch-5.10.16.xz 498880 BLAKE2B 14061b505285f24938fb955ccc7f9fbd78ccc0b1026bffb17a89fdad08ea54bfee7bbb841123d9af4d0720a960a27c649c39852af7e2be8a286af926c7bce9c0 SHA512 be9cfe1ae6697956ca7476cedc212a8cbd9da2c3c72096a89afaaf73c5b6655fd04d458f96c472f680c5513c0ea3e4449c4092a958425b6040f0c7774453cd2f
diff --git a/dev-util/perf/perf-5.10.16.ebuild b/dev-util/perf/perf-5.10.16.ebuild
new file mode 100644
index 00000000000..4aee115ceb6
--- /dev/null
+++ b/dev-util/perf/perf-5.10.16.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit bash-completion-r1 estack llvm toolchain-funcs prefix python-r1 linux-info
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+ LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+ PATCH_VERSION=$(ver_cut 1-3)
+ LINUX_PATCH=patch-${PV//_/-}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+ https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ ${PV} == *.*.* ]] ; then
+ # stable-release series
+ LINUX_VER=$(ver_cut 1-2)
+ LINUX_PATCH=patch-${PV}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+ LINUX_VER=${PV}
+ SRC_URI=""
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+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"
+# TODO babeltrace
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="
+ ${LINUX_PATCH+dev-util/patchutils}
+ 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? (
+ <sys-devel/clang-10:*
+ <sys-devel/llvm-10:*
+ )
+ demangle? ( sys-libs/binutils-libs:= )
+ gtk? ( x11-libs/gtk+:2 )
+ java? ( virtual/jre:* )
+ libpfm? ( dev-libs/libpfm )
+ lzma? ( app-arch/xz-utils )
+ numa? ( sys-process/numactl )
+ perl? ( dev-lang/perl:= )
+ python? ( ${PYTHON_DEPS} )
+ slang? ( sys-libs/slang )
+ systemtap? ( dev-util/systemtap )
+ unwind? ( sys-libs/libunwind )
+ zlib? ( sys-libs/zlib )
+ dev-libs/elfutils"
+
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-4.19
+ java? ( virtual/jdk )
+"
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
+CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+
+pkg_pretend() {
+ if ! use doc ; then
+ ewarn "Without the doc USE flag you won't get any documentation nor man pages."
+ ewarn "And without man pages, you won't get any --help output for perf and its"
+ ewarn "sub-tools."
+ fi
+}
+
+pkg_setup() {
+ use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
+}
+
+src_unpack() {
+ local paths=(
+ tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
+ scripts include lib "arch/*/lib"
+ )
+
+ # We expect the tar implementation to support the -j option (both
+ # GNU tar and libarchive's tar support that).
+ echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+ tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+ "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ eshopts_push -o noglob
+ ebegin "Filtering partial source patch"
+ filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+ > ${P}.patch
+ eend $? || die "filterdiff failed"
+ eshopts_pop
+ fi
+
+ local a
+ for a in ${A}; do
+ [[ ${a} == ${LINUX_SOURCES} ]] && continue
+ [[ ${a} == ${LINUX_PATCH} ]] && continue
+ unpack ${a}
+ 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
+ # into the kernel, so it wants an ARCH that looks like the kernel arch,
+ # but it also wants to know about the split value -- i386/x86_64 vs just
+ # x86. We can get that by telling the func to use an older linux version.
+ # It's kind of a hack, but not that bad ...
+
+ # LIBDIR sets a search path of perf-gtk.so. Bug 515954
+
+ local arch=$(tc-arch-kernel)
+ 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)" \
+ PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+ prefix="${EPREFIX}/usr" bindir_relative="bin" \
+ tipdir="share/doc/${PF}" \
+ EXTRA_CFLAGS="${CFLAGS}" \
+ ARCH="${arch}" \
+ JDIR="${java_dir}" \
+ LIBCLANGLLVM=$(usex clang 1 "") \
+ LIBPFM4=$(usex libpfm 1 "") \
+ NO_AUXTRACE="" \
+ NO_BACKTRACE="" \
+ NO_CORESIGHT=1 \
+ NO_DEMANGLE=$(puse demangle) \
+ GTK2=$(usex gtk 1 "") \
+ feature-gtk2-infobar=$(usex gtk 1 "") \
+ NO_JVMTI=$(puse java) \
+ NO_LIBAUDIT=$(puse audit) \
+ NO_LIBBABELTRACE=1 \
+ NO_LIBBIONIC=1 \
+ NO_LIBBPF= \
+ NO_LIBCRYPTO=$(puse crypt) \
+ NO_LIBDW_DWARF_UNWIND= \
+ NO_LIBELF= \
+ NO_LIBNUMA=$(puse numa) \
+ NO_LIBPERL=$(puse perl) \
+ NO_LIBPYTHON=$(puse python) \
+ NO_LIBUNWIND=$(puse unwind) \
+ NO_SDT=$(puse systemtap) \
+ NO_SLANG=$(puse slang) \
+ NO_LZMA=$(puse lzma) \
+ NO_ZLIB= \
+ WERROR=0 \
+ LIBDIR="/usr/libexec/perf-core" \
+ "$@"
+}
+
+src_compile() {
+ # test-clang.bin not build with g++
+ if use clang; then
+ pushd "${S_K}/tools/build/feature/" || die
+ make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
+ popd
+ fi
+ perf_make -f Makefile.perf
+ use doc && perf_make -C Documentation
+}
+
+src_test() {
+ :
+}
+
+src_install() {
+ _install_python_ext() {
+ perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
+ }
+
+ perf_make -f Makefile.perf install DESTDIR="${D}"
+
+ if use python; then
+ python_foreach_impl _install_python_ext
+ fi
+
+ if use gtk; then
+ local libdir
+ libdir="$(get_libdir)"
+ # on some arches it ends up in lib even on 64bit, ppc64 for instance.
+ [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
+ mv "${ED}"/usr/${libdir}/libperf-gtk.so \
+ "${ED}"/usr/libexec/perf-core || die
+ fi
+
+ dodoc CREDITS
+
+ dodoc *txt Documentation/*.txt
+
+ # perf needs this decompressed to print out tips for users
+ docompress -x /usr/share/doc/${PF}/tips.txt
+
+ if use doc ; then
+ HTML_DOCS="Documentation/*.html" einstalldocs
+ doman Documentation/*.1
+ fi
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2021-08-05 2:17 Yixun Lan
0 siblings, 0 replies; 141+ messages in thread
From: Yixun Lan @ 2021-08-05 2:17 UTC (permalink / raw
To: gentoo-commits
commit: 310723717fdb3131ac2c9a05fc171b5b2e4b58a6
Author: Ye Cao <ye.c <AT> rioslab <DOT> org>
AuthorDate: Sat Jul 31 13:43:28 2021 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Thu Aug 5 02:17:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31072371
dev-util/perf: add ~riscv keyword
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Ye Cao <ye.c <AT> rioslab.org>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
dev-util/perf/perf-5.12.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-5.12.ebuild b/dev-util/perf/perf-5.12.ebuild
index 795634dc8cd..2f8dc2e665c 100644
--- a/dev-util/perf/perf-5.12.ebuild
+++ b/dev-util/perf/perf-5.12.ebuild
@@ -31,7 +31,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"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE="audit babeltrace clang crypt debug +demangle +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib"
# TODO babeltrace
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2021-09-13 17:48 Jakov Smolić
0 siblings, 0 replies; 141+ messages in thread
From: Jakov Smolić @ 2021-09-13 17:48 UTC (permalink / raw
To: gentoo-commits
commit: f34d890bb88e814c2dbff0edc6f9d37f88253107
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 13 17:35:19 2021 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Mon Sep 13 17:46:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f34d890b
dev-util/perf: Add note re src_{unpack,prepare} in bpftool
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
dev-util/perf/perf-5.12.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dev-util/perf/perf-5.12.ebuild b/dev-util/perf/perf-5.12.ebuild
index 2f8dc2e665c..74ab0c5a493 100644
--- a/dev-util/perf/perf-5.12.ebuild
+++ b/dev-util/perf/perf-5.12.ebuild
@@ -96,6 +96,8 @@ pkg_setup() {
python_setup
}
+# src_unpack and src_prepare are copied to dev-util/bpftool since
+# it's building from the same tarball, please keep it in sync with bpftool
src_unpack() {
local paths=(
tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2021-11-10 12:31 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2021-11-10 12:31 UTC (permalink / raw
To: gentoo-commits
commit: 3a5ad8fb6c6ac1f39b95c936e5824d792e5104df
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 10 12:19:05 2021 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Wed Nov 10 12:31:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a5ad8fb
dev-util/perf: fix bugs 727096, 790836, 795147, and 821175
Closes: https://bugs.gentoo.org/727096
Closes: https://bugs.gentoo.org/790836
Closes: https://bugs.gentoo.org/795147
Closes: https://bugs.gentoo.org/821175
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
.../perf/{perf-5.12.ebuild => perf-5.12-r1.ebuild} | 28 ++++++++++++++--------
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/dev-util/perf/perf-5.12.ebuild b/dev-util/perf/perf-5.12-r1.ebuild
similarity index 91%
rename from dev-util/perf/perf-5.12.ebuild
rename to dev-util/perf/perf-5.12-r1.ebuild
index 74ab0c5a493..97803daa0f4 100644
--- a/dev-util/perf/perf-5.12.ebuild
+++ b/dev-util/perf/perf-5.12-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
inherit bash-completion-r1 estack llvm toolchain-funcs prefix python-r1 linux-info
DESCRIPTION="Userland tools for Linux Performance Counters"
@@ -32,8 +32,8 @@ 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 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit babeltrace clang crypt debug +demangle +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib"
-# TODO babeltrace
+IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
+
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
BDEPEND="
@@ -52,12 +52,11 @@ BDEPEND="
RDEPEND="audit? ( sys-process/audit )
babeltrace? ( dev-util/babeltrace )
- crypt? ( dev-libs/openssl:0= )
+ crypt? ( virtual/libcrypt:= )
clang? (
<sys-devel/clang-10:*
<sys-devel/llvm-10:*
)
- demangle? ( sys-libs/binutils-libs:= )
gtk? ( x11-libs/gtk+:2 )
java? ( virtual/jre:* )
libpfm? ( dev-libs/libpfm )
@@ -69,10 +68,12 @@ RDEPEND="audit? ( sys-process/audit )
systemtap? ( dev-util/systemtap )
unwind? ( sys-libs/libunwind )
zlib? ( sys-libs/zlib )
- dev-libs/elfutils"
+ zstd? ( app-arch/zstd )
+ dev-libs/elfutils
+ sys-libs/binutils-libs:="
DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-4.19
+ >=sys-kernel/linux-headers-5.10
java? ( virtual/jdk )
"
@@ -81,6 +82,11 @@ S="${S_K}/tools/perf"
CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+QA_FLAGS_IGNORED=(
+ usr/bin/perf-read-vdso32 # not linked with anything except for libc
+ usr/libexec/perf-core/dlfilters/dlfilter-test-api-v0.so # not installed
+)
+
pkg_pretend() {
if ! use doc ; then
ewarn "Without the doc USE flag you won't get any documentation nor man pages."
@@ -178,6 +184,7 @@ perf_make() {
prefix="${EPREFIX}/usr" bindir_relative="bin" \
tipdir="share/doc/${PF}" \
EXTRA_CFLAGS="${CFLAGS}" \
+ EXTRA_LDFLAGS="${LDFLAGS}" \
ARCH="${arch}" \
JDIR="${java_dir}" \
LIBCLANGLLVM=$(usex clang 1 "") \
@@ -185,7 +192,7 @@ perf_make() {
NO_AUXTRACE="" \
NO_BACKTRACE="" \
NO_CORESIGHT=1 \
- NO_DEMANGLE=$(puse demangle) \
+ NO_DEMANGLE= \
GTK2=$(usex gtk 1 "") \
feature-gtk2-infobar=$(usex gtk 1 "") \
NO_JVMTI=$(puse java) \
@@ -200,10 +207,11 @@ perf_make() {
NO_LIBPERL=$(puse perl) \
NO_LIBPYTHON=$(puse python) \
NO_LIBUNWIND=$(puse unwind) \
+ NO_LIBZSTD=$(puse zstd) \
NO_SDT=$(puse systemtap) \
NO_SLANG=$(puse slang) \
NO_LZMA=$(puse lzma) \
- NO_ZLIB= \
+ NO_ZLIB=$(puse zlib) \
WERROR=0 \
LIBDIR="/usr/libexec/perf-core" \
libdir="${EPREFIX}/usr/$(get_libdir)" \
@@ -219,7 +227,7 @@ src_compile() {
popd
fi
perf_make -f Makefile.perf
- use doc && perf_make -C Documentation
+ use doc && perf_make -C Documentation man html
}
src_test() {
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2021-11-10 12:31 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2021-11-10 12:31 UTC (permalink / raw
To: gentoo-commits
commit: 810ec0ab763430706ba3fd0cd750cac9be90193e
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 10 10:45:04 2021 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Wed Nov 10 12:31:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=810ec0ab
dev-util/perf: version bump to 5.15
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/Manifest | 1 +
dev-util/perf/perf-5.15.ebuild | 268 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 269 insertions(+)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 58089a339b1..76ced672366 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,5 +1,6 @@
DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
DIST linux-5.11.tar.xz 117619104 BLAKE2B 81300c27bd5476387a83123aaeb4163c73eb61e9245806c23660cb5e6a4fa88ffc9def027031335fa0270fc4080506cd415990014364e3a98b9d2e8c58a29524 SHA512 a567ec133018bb5ec00c60281479b466c26e02137a93a9c690e83997947df02b6fd94e76e8df748f6d70ceb58a19bacc3b1467de10b7a1fad2763db32b3f1330
DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
+DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
DIST patch-5.10.16.xz 498880 BLAKE2B 14061b505285f24938fb955ccc7f9fbd78ccc0b1026bffb17a89fdad08ea54bfee7bbb841123d9af4d0720a960a27c649c39852af7e2be8a286af926c7bce9c0 SHA512 be9cfe1ae6697956ca7476cedc212a8cbd9da2c3c72096a89afaaf73c5b6655fd04d458f96c472f680c5513c0ea3e4449c4092a958425b6040f0c7774453cd2f
diff --git a/dev-util/perf/perf-5.15.ebuild b/dev-util/perf/perf-5.15.ebuild
new file mode 100644
index 00000000000..97803daa0f4
--- /dev/null
+++ b/dev-util/perf/perf-5.15.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+inherit bash-completion-r1 estack llvm toolchain-funcs prefix python-r1 linux-info
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+ LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+ PATCH_VERSION=$(ver_cut 1-3)
+ LINUX_PATCH=patch-${PV//_/-}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+ https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ ${PV} == *.*.* ]] ; then
+ # stable-release series
+ LINUX_VER=$(ver_cut 1-2)
+ LINUX_PATCH=patch-${PV}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+ LINUX_VER=${PV}
+ SRC_URI=""
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+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 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+ ${LINUX_PATCH+dev-util/patchutils}
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+ doc? (
+ app-text/asciidoc
+ app-text/sgml-common
+ app-text/xmlto
+ sys-process/time
+ )
+ ${PYTHON_DEPS}
+"
+
+RDEPEND="audit? ( sys-process/audit )
+ babeltrace? ( dev-util/babeltrace )
+ crypt? ( virtual/libcrypt:= )
+ clang? (
+ <sys-devel/clang-10:*
+ <sys-devel/llvm-10:*
+ )
+ gtk? ( x11-libs/gtk+:2 )
+ java? ( virtual/jre:* )
+ libpfm? ( dev-libs/libpfm )
+ lzma? ( app-arch/xz-utils )
+ numa? ( sys-process/numactl )
+ perl? ( dev-lang/perl:= )
+ python? ( ${PYTHON_DEPS} )
+ slang? ( sys-libs/slang )
+ systemtap? ( dev-util/systemtap )
+ unwind? ( sys-libs/libunwind )
+ zlib? ( sys-libs/zlib )
+ zstd? ( app-arch/zstd )
+ dev-libs/elfutils
+ sys-libs/binutils-libs:="
+
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-5.10
+ java? ( virtual/jdk )
+"
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
+CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+
+QA_FLAGS_IGNORED=(
+ usr/bin/perf-read-vdso32 # not linked with anything except for libc
+ usr/libexec/perf-core/dlfilters/dlfilter-test-api-v0.so # not installed
+)
+
+pkg_pretend() {
+ if ! use doc ; then
+ ewarn "Without the doc USE flag you won't get any documentation nor man pages."
+ ewarn "And without man pages, you won't get any --help output for perf and its"
+ ewarn "sub-tools."
+ fi
+}
+
+pkg_setup() {
+ use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
+ # We enable python unconditionally as libbpf always generates
+ # API headers using python script
+ python_setup
+}
+
+# src_unpack and src_prepare are copied to dev-util/bpftool since
+# it's building from the same tarball, please keep it in sync with bpftool
+src_unpack() {
+ local paths=(
+ tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
+ scripts include lib "arch/*/lib"
+ )
+
+ # We expect the tar implementation to support the -j option (both
+ # GNU tar and libarchive's tar support that).
+ echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+ tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+ "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ eshopts_push -o noglob
+ ebegin "Filtering partial source patch"
+ filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+ > ${P}.patch
+ eend $? || die "filterdiff failed"
+ eshopts_pop
+ fi
+
+ local a
+ for a in ${A}; do
+ [[ ${a} == ${LINUX_SOURCES} ]] && continue
+ [[ ${a} == ${LINUX_PATCH} ]] && continue
+ unpack ${a}
+ 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
+ # into the kernel, so it wants an ARCH that looks like the kernel arch,
+ # but it also wants to know about the split value -- i386/x86_64 vs just
+ # x86. We can get that by telling the func to use an older linux version.
+ # It's kind of a hack, but not that bad ...
+
+ # LIBDIR sets a search path of perf-gtk.so. Bug 515954
+
+ local arch=$(tc-arch-kernel)
+ local java_dir
+ use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
+ # FIXME: NO_CORESIGHT
+ 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)" \
+ PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+ prefix="${EPREFIX}/usr" bindir_relative="bin" \
+ tipdir="share/doc/${PF}" \
+ EXTRA_CFLAGS="${CFLAGS}" \
+ EXTRA_LDFLAGS="${LDFLAGS}" \
+ ARCH="${arch}" \
+ JDIR="${java_dir}" \
+ LIBCLANGLLVM=$(usex clang 1 "") \
+ LIBPFM4=$(usex libpfm 1 "") \
+ NO_AUXTRACE="" \
+ NO_BACKTRACE="" \
+ NO_CORESIGHT=1 \
+ NO_DEMANGLE= \
+ GTK2=$(usex gtk 1 "") \
+ feature-gtk2-infobar=$(usex gtk 1 "") \
+ NO_JVMTI=$(puse java) \
+ NO_LIBAUDIT=$(puse audit) \
+ NO_LIBBABELTRACE=$(puse babeltrace) \
+ NO_LIBBIONIC=1 \
+ NO_LIBBPF= \
+ NO_LIBCRYPTO=$(puse crypt) \
+ NO_LIBDW_DWARF_UNWIND= \
+ NO_LIBELF= \
+ NO_LIBNUMA=$(puse numa) \
+ NO_LIBPERL=$(puse perl) \
+ NO_LIBPYTHON=$(puse python) \
+ NO_LIBUNWIND=$(puse unwind) \
+ NO_LIBZSTD=$(puse zstd) \
+ NO_SDT=$(puse systemtap) \
+ NO_SLANG=$(puse slang) \
+ NO_LZMA=$(puse lzma) \
+ NO_ZLIB=$(puse zlib) \
+ WERROR=0 \
+ LIBDIR="/usr/libexec/perf-core" \
+ libdir="${EPREFIX}/usr/$(get_libdir)" \
+ plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins" \
+ "$@"
+}
+
+src_compile() {
+ # test-clang.bin not build with g++
+ if use clang; then
+ pushd "${S_K}/tools/build/feature/" || die
+ make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
+ popd
+ fi
+ perf_make -f Makefile.perf
+ use doc && perf_make -C Documentation man html
+}
+
+src_test() {
+ :
+}
+
+src_install() {
+ _install_python_ext() {
+ perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
+ }
+
+ perf_make -f Makefile.perf install DESTDIR="${D}"
+
+ if use python; then
+ python_foreach_impl _install_python_ext
+ fi
+
+ if use gtk; then
+ local libdir
+ libdir="$(get_libdir)"
+ # on some arches it ends up in lib even on 64bit, ppc64 for instance.
+ [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
+ mv "${ED}"/usr/${libdir}/libperf-gtk.so \
+ "${ED}"/usr/libexec/perf-core || die
+ fi
+
+ dodoc CREDITS
+
+ dodoc *txt Documentation/*.txt
+
+ # perf needs this decompressed to print out tips for users
+ docompress -x /usr/share/doc/${PF}/tips.txt
+
+ if use doc ; then
+ HTML_DOCS="Documentation/*.html" einstalldocs
+ doman Documentation/*.1
+ fi
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2021-11-10 12:31 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2021-11-10 12:31 UTC (permalink / raw
To: gentoo-commits
commit: 942b887b65eb969ff3327ce3ad7f7cae49d5e3a4
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 10 11:13:08 2021 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Wed Nov 10 12:31:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=942b887b
dev-util/perf: drop old
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/Manifest | 3 -
dev-util/perf/perf-5.10.16.ebuild | 250 ------------------------------------
dev-util/perf/perf-5.11.ebuild | 258 --------------------------------------
3 files changed, 511 deletions(-)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 76ced672366..2b586b7e417 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,6 +1,3 @@
-DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
-DIST linux-5.11.tar.xz 117619104 BLAKE2B 81300c27bd5476387a83123aaeb4163c73eb61e9245806c23660cb5e6a4fa88ffc9def027031335fa0270fc4080506cd415990014364e3a98b9d2e8c58a29524 SHA512 a567ec133018bb5ec00c60281479b466c26e02137a93a9c690e83997947df02b6fd94e76e8df748f6d70ceb58a19bacc3b1467de10b7a1fad2763db32b3f1330
DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
-DIST patch-5.10.16.xz 498880 BLAKE2B 14061b505285f24938fb955ccc7f9fbd78ccc0b1026bffb17a89fdad08ea54bfee7bbb841123d9af4d0720a960a27c649c39852af7e2be8a286af926c7bce9c0 SHA512 be9cfe1ae6697956ca7476cedc212a8cbd9da2c3c72096a89afaaf73c5b6655fd04d458f96c472f680c5513c0ea3e4449c4092a958425b6040f0c7774453cd2f
diff --git a/dev-util/perf/perf-5.10.16.ebuild b/dev-util/perf/perf-5.10.16.ebuild
deleted file mode 100644
index 4aee115ceb6..00000000000
--- a/dev-util/perf/perf-5.10.16.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit bash-completion-r1 estack llvm toolchain-funcs prefix python-r1 linux-info
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
- LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
- PATCH_VERSION=$(ver_cut 1-3)
- LINUX_PATCH=patch-${PV//_/-}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
- https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ ${PV} == *.*.* ]] ; then
- # stable-release series
- LINUX_VER=$(ver_cut 1-2)
- LINUX_PATCH=patch-${PV}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
- LINUX_VER=${PV}
- SRC_URI=""
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-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"
-# TODO babeltrace
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="
- ${LINUX_PATCH+dev-util/patchutils}
- 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? (
- <sys-devel/clang-10:*
- <sys-devel/llvm-10:*
- )
- demangle? ( sys-libs/binutils-libs:= )
- gtk? ( x11-libs/gtk+:2 )
- java? ( virtual/jre:* )
- libpfm? ( dev-libs/libpfm )
- lzma? ( app-arch/xz-utils )
- numa? ( sys-process/numactl )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- slang? ( sys-libs/slang )
- systemtap? ( dev-util/systemtap )
- unwind? ( sys-libs/libunwind )
- zlib? ( sys-libs/zlib )
- dev-libs/elfutils"
-
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-4.19
- java? ( virtual/jdk )
-"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-pkg_pretend() {
- if ! use doc ; then
- ewarn "Without the doc USE flag you won't get any documentation nor man pages."
- ewarn "And without man pages, you won't get any --help output for perf and its"
- ewarn "sub-tools."
- fi
-}
-
-pkg_setup() {
- use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
-}
-
-src_unpack() {
- local paths=(
- tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
- scripts include lib "arch/*/lib"
- )
-
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
- > ${P}.patch
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- 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
- # into the kernel, so it wants an ARCH that looks like the kernel arch,
- # but it also wants to know about the split value -- i386/x86_64 vs just
- # x86. We can get that by telling the func to use an older linux version.
- # It's kind of a hack, but not that bad ...
-
- # LIBDIR sets a search path of perf-gtk.so. Bug 515954
-
- local arch=$(tc-arch-kernel)
- 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)" \
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \
- prefix="${EPREFIX}/usr" bindir_relative="bin" \
- tipdir="share/doc/${PF}" \
- EXTRA_CFLAGS="${CFLAGS}" \
- ARCH="${arch}" \
- JDIR="${java_dir}" \
- LIBCLANGLLVM=$(usex clang 1 "") \
- LIBPFM4=$(usex libpfm 1 "") \
- NO_AUXTRACE="" \
- NO_BACKTRACE="" \
- NO_CORESIGHT=1 \
- NO_DEMANGLE=$(puse demangle) \
- GTK2=$(usex gtk 1 "") \
- feature-gtk2-infobar=$(usex gtk 1 "") \
- NO_JVMTI=$(puse java) \
- NO_LIBAUDIT=$(puse audit) \
- NO_LIBBABELTRACE=1 \
- NO_LIBBIONIC=1 \
- NO_LIBBPF= \
- NO_LIBCRYPTO=$(puse crypt) \
- NO_LIBDW_DWARF_UNWIND= \
- NO_LIBELF= \
- NO_LIBNUMA=$(puse numa) \
- NO_LIBPERL=$(puse perl) \
- NO_LIBPYTHON=$(puse python) \
- NO_LIBUNWIND=$(puse unwind) \
- NO_SDT=$(puse systemtap) \
- NO_SLANG=$(puse slang) \
- NO_LZMA=$(puse lzma) \
- NO_ZLIB= \
- WERROR=0 \
- LIBDIR="/usr/libexec/perf-core" \
- "$@"
-}
-
-src_compile() {
- # test-clang.bin not build with g++
- if use clang; then
- pushd "${S_K}/tools/build/feature/" || die
- make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
- popd
- fi
- perf_make -f Makefile.perf
- use doc && perf_make -C Documentation
-}
-
-src_test() {
- :
-}
-
-src_install() {
- _install_python_ext() {
- perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
- }
-
- perf_make -f Makefile.perf install DESTDIR="${D}"
-
- if use python; then
- python_foreach_impl _install_python_ext
- fi
-
- if use gtk; then
- local libdir
- libdir="$(get_libdir)"
- # on some arches it ends up in lib even on 64bit, ppc64 for instance.
- [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
- mv "${ED}"/usr/${libdir}/libperf-gtk.so \
- "${ED}"/usr/libexec/perf-core || die
- fi
-
- dodoc CREDITS
-
- dodoc *txt Documentation/*.txt
-
- # perf needs this decompressed to print out tips for users
- docompress -x /usr/share/doc/${PF}/tips.txt
-
- if use doc ; then
- HTML_DOCS="Documentation/*.html" einstalldocs
- doman Documentation/*.1
- fi
-}
diff --git a/dev-util/perf/perf-5.11.ebuild b/dev-util/perf/perf-5.11.ebuild
deleted file mode 100644
index 9de12cc7035..00000000000
--- a/dev-util/perf/perf-5.11.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit bash-completion-r1 estack llvm toolchain-funcs prefix python-r1 linux-info
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
- LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
- PATCH_VERSION=$(ver_cut 1-3)
- LINUX_PATCH=patch-${PV//_/-}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
- https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ ${PV} == *.*.* ]] ; then
- # stable-release series
- LINUX_VER=$(ver_cut 1-2)
- LINUX_PATCH=patch-${PV}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
- LINUX_VER=${PV}
- SRC_URI=""
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-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"
-# TODO babeltrace
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
- ${LINUX_PATCH+dev-util/patchutils}
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- doc? (
- app-text/asciidoc
- app-text/sgml-common
- app-text/xmlto
- sys-process/time
- )
- ${PYTHON_DEPS}
-"
-
-RDEPEND="audit? ( sys-process/audit )
- crypt? ( dev-libs/openssl:0= )
- clang? (
- <sys-devel/clang-10:*
- <sys-devel/llvm-10:*
- )
- demangle? ( sys-libs/binutils-libs:= )
- gtk? ( x11-libs/gtk+:2 )
- java? ( virtual/jre:* )
- libpfm? ( dev-libs/libpfm )
- lzma? ( app-arch/xz-utils )
- numa? ( sys-process/numactl )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- slang? ( sys-libs/slang )
- systemtap? ( dev-util/systemtap )
- unwind? ( sys-libs/libunwind )
- zlib? ( sys-libs/zlib )
- dev-libs/elfutils"
-
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-4.19
- java? ( virtual/jdk )
-"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-pkg_pretend() {
- if ! use doc ; then
- ewarn "Without the doc USE flag you won't get any documentation nor man pages."
- ewarn "And without man pages, you won't get any --help output for perf and its"
- ewarn "sub-tools."
- fi
-}
-
-pkg_setup() {
- use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
- # We enable python unconditionally as libbpf always generates
- # API headers using python script
- python_setup
-}
-
-src_unpack() {
- local paths=(
- tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
- scripts include lib "arch/*/lib"
- )
-
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
- > ${P}.patch
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- 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
- # into the kernel, so it wants an ARCH that looks like the kernel arch,
- # but it also wants to know about the split value -- i386/x86_64 vs just
- # x86. We can get that by telling the func to use an older linux version.
- # It's kind of a hack, but not that bad ...
-
- # LIBDIR sets a search path of perf-gtk.so. Bug 515954
-
- local arch=$(tc-arch-kernel)
- 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)" \
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \
- prefix="${EPREFIX}/usr" bindir_relative="bin" \
- tipdir="share/doc/${PF}" \
- EXTRA_CFLAGS="${CFLAGS}" \
- ARCH="${arch}" \
- JDIR="${java_dir}" \
- LIBCLANGLLVM=$(usex clang 1 "") \
- LIBPFM4=$(usex libpfm 1 "") \
- NO_AUXTRACE="" \
- NO_BACKTRACE="" \
- NO_CORESIGHT=1 \
- NO_DEMANGLE=$(puse demangle) \
- GTK2=$(usex gtk 1 "") \
- feature-gtk2-infobar=$(usex gtk 1 "") \
- NO_JVMTI=$(puse java) \
- NO_LIBAUDIT=$(puse audit) \
- NO_LIBBABELTRACE=1 \
- NO_LIBBIONIC=1 \
- NO_LIBBPF= \
- NO_LIBCRYPTO=$(puse crypt) \
- NO_LIBDW_DWARF_UNWIND= \
- NO_LIBELF= \
- NO_LIBNUMA=$(puse numa) \
- NO_LIBPERL=$(puse perl) \
- NO_LIBPYTHON=$(puse python) \
- NO_LIBUNWIND=$(puse unwind) \
- NO_SDT=$(puse systemtap) \
- NO_SLANG=$(puse slang) \
- NO_LZMA=$(puse lzma) \
- NO_ZLIB= \
- WERROR=0 \
- LIBDIR="/usr/libexec/perf-core" \
- libdir="${EPREFIX}/usr/$(get_libdir)" \
- plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins" \
- "$@"
-}
-
-src_compile() {
- # test-clang.bin not build with g++
- if use clang; then
- pushd "${S_K}/tools/build/feature/" || die
- make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
- popd
- fi
- perf_make -f Makefile.perf
- use doc && perf_make -C Documentation
-}
-
-src_test() {
- :
-}
-
-src_install() {
- _install_python_ext() {
- perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
- }
-
- perf_make -f Makefile.perf install DESTDIR="${D}"
-
- if use python; then
- python_foreach_impl _install_python_ext
- fi
-
- if use gtk; then
- local libdir
- libdir="$(get_libdir)"
- # on some arches it ends up in lib even on 64bit, ppc64 for instance.
- [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
- mv "${ED}"/usr/${libdir}/libperf-gtk.so \
- "${ED}"/usr/libexec/perf-core || die
- fi
-
- dodoc CREDITS
-
- dodoc *txt Documentation/*.txt
-
- # perf needs this decompressed to print out tips for users
- docompress -x /usr/share/doc/${PF}/tips.txt
-
- if use doc ; then
- HTML_DOCS="Documentation/*.html" einstalldocs
- doman Documentation/*.1
- fi
-}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2021-11-10 15:14 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2021-11-10 15:14 UTC (permalink / raw
To: gentoo-commits
commit: 905d7080083f71c5b942d579757fbb190129b9d0
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 10 15:13:16 2021 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Wed Nov 10 15:14:30 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=905d7080
dev-util/perf: fix bug 822873
Closes: https://bugs.gentoo.org/822873
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/perf-5.12-r1.ebuild | 3 +--
dev-util/perf/perf-5.15.ebuild | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/dev-util/perf/perf-5.12-r1.ebuild b/dev-util/perf/perf-5.12-r1.ebuild
index 97803daa0f4..3d3079203e9 100644
--- a/dev-util/perf/perf-5.12-r1.ebuild
+++ b/dev-util/perf/perf-5.12-r1.ebuild
@@ -227,7 +227,7 @@ src_compile() {
popd
fi
perf_make -f Makefile.perf
- use doc && perf_make -C Documentation man html
+ use doc && perf_make -C Documentation man
}
src_test() {
@@ -262,7 +262,6 @@ src_install() {
docompress -x /usr/share/doc/${PF}/tips.txt
if use doc ; then
- HTML_DOCS="Documentation/*.html" einstalldocs
doman Documentation/*.1
fi
}
diff --git a/dev-util/perf/perf-5.15.ebuild b/dev-util/perf/perf-5.15.ebuild
index 97803daa0f4..3d3079203e9 100644
--- a/dev-util/perf/perf-5.15.ebuild
+++ b/dev-util/perf/perf-5.15.ebuild
@@ -227,7 +227,7 @@ src_compile() {
popd
fi
perf_make -f Makefile.perf
- use doc && perf_make -C Documentation man html
+ use doc && perf_make -C Documentation man
}
src_test() {
@@ -262,7 +262,6 @@ src_install() {
docompress -x /usr/share/doc/${PF}/tips.txt
if use doc ; then
- HTML_DOCS="Documentation/*.html" einstalldocs
doman Documentation/*.1
fi
}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2021-11-11 8:56 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2021-11-11 8:56 UTC (permalink / raw
To: gentoo-commits
commit: 6ede713804d35a8de4590ac3459a7c8f2c0ee4fd
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 11 08:51:20 2021 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Thu Nov 11 08:51:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ede7138
dev-util/perf: drop hprefixify for removed script
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/perf-5.15-r1.ebuild | 5 -----
1 file changed, 5 deletions(-)
diff --git a/dev-util/perf/perf-5.15-r1.ebuild b/dev-util/perf/perf-5.15-r1.ebuild
index be6ab29e81f..d676dd95349 100644
--- a/dev-util/perf/perf-5.15-r1.ebuild
+++ b/dev-util/perf/perf-5.15-r1.ebuild
@@ -162,11 +162,6 @@ src_prepare() {
# 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; }
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2022-01-01 15:15 Arthur Zamarin
0 siblings, 0 replies; 141+ messages in thread
From: Arthur Zamarin @ 2022-01-01 15:15 UTC (permalink / raw
To: gentoo-commits
commit: 03374399341cd650fe78b27227ee8c980649af1c
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 1 15:14:54 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 1 15:15:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03374399
dev-util/perf: Stabilize 5.15-r1 ppc, #829946
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-util/perf/perf-5.15-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-5.15-r1.ebuild b/dev-util/perf/perf-5.15-r1.ebuild
index 64f490855235..55b365bca3b2 100644
--- a/dev-util/perf/perf-5.15-r1.ebuild
+++ b/dev-util/perf/perf-5.15-r1.ebuild
@@ -31,7 +31,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 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm ~arm64 ~mips ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2022-01-01 15:15 Arthur Zamarin
0 siblings, 0 replies; 141+ messages in thread
From: Arthur Zamarin @ 2022-01-01 15:15 UTC (permalink / raw
To: gentoo-commits
commit: b835b301d72d9592931db3f2804b168ac8c0f097
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 1 15:14:47 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 1 15:15:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b835b301
dev-util/perf: Stabilize 5.15-r1 ppc64, #829946
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-util/perf/perf-5.15-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-5.15-r1.ebuild b/dev-util/perf/perf-5.15-r1.ebuild
index 930f2a34ebb6..64f490855235 100644
--- a/dev-util/perf/perf-5.15-r1.ebuild
+++ b/dev-util/perf/perf-5.15-r1.ebuild
@@ -31,7 +31,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 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm ~arm64 ~mips ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2022-01-01 15:15 Arthur Zamarin
0 siblings, 0 replies; 141+ messages in thread
From: Arthur Zamarin @ 2022-01-01 15:15 UTC (permalink / raw
To: gentoo-commits
commit: 46d0a4c6bf01832d77b74ccfb4643ed7dcc7200a
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 1 15:14:45 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 1 15:15:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46d0a4c6
dev-util/perf: Stabilize 5.15-r1 arm, #829946
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-util/perf/perf-5.15-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-util/perf/perf-5.15-r1.ebuild b/dev-util/perf/perf-5.15-r1.ebuild
index d676dd953495..930f2a34ebb6 100644
--- a/dev-util/perf/perf-5.15-r1.ebuild
+++ b/dev-util/perf/perf-5.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -31,7 +31,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 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2022-01-02 5:52 Sam James
0 siblings, 0 replies; 141+ messages in thread
From: Sam James @ 2022-01-02 5:52 UTC (permalink / raw
To: gentoo-commits
commit: 9b29cd9caa75bc87db2749dabd38df7b0eded621
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 2 05:51:30 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 2 05:51:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b29cd9c
dev-util/perf: Stabilize 5.15-r1 amd64, #829946
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/perf/perf-5.15-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-5.15-r1.ebuild b/dev-util/perf/perf-5.15-r1.ebuild
index 55b365bca3b2..c431cd8b3003 100644
--- a/dev-util/perf/perf-5.15-r1.ebuild
+++ b/dev-util/perf/perf-5.15-r1.ebuild
@@ -31,7 +31,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 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2022-01-02 9:59 Sam James
0 siblings, 0 replies; 141+ messages in thread
From: Sam James @ 2022-01-02 9:59 UTC (permalink / raw
To: gentoo-commits
commit: 092e194b155177ed93f809461fb74a0a76bfda43
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 2 09:58:38 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 2 09:58:38 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=092e194b
dev-util/perf: Stabilize 5.15-r1 x86, #829946
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/perf/perf-5.15-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-5.15-r1.ebuild b/dev-util/perf/perf-5.15-r1.ebuild
index c431cd8b3003..f33b5cf08d77 100644
--- a/dev-util/perf/perf-5.15-r1.ebuild
+++ b/dev-util/perf/perf-5.15-r1.ebuild
@@ -31,7 +31,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 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2022-01-03 9:19 Sam James
0 siblings, 0 replies; 141+ messages in thread
From: Sam James @ 2022-01-03 9:19 UTC (permalink / raw
To: gentoo-commits
commit: 52385481bc4b8205f5573d39c02d0e521d635fcb
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 3 09:19:28 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 3 09:19:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52385481
dev-util/perf: Stabilize 5.15-r1 arm64, #829946
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/perf/perf-5.15-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-5.15-r1.ebuild b/dev-util/perf/perf-5.15-r1.ebuild
index f33b5cf08d77..d3d3cab43544 100644
--- a/dev-util/perf/perf-5.15-r1.ebuild
+++ b/dev-util/perf/perf-5.15-r1.ebuild
@@ -31,7 +31,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 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2022-04-07 10:14 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2022-04-07 10:14 UTC (permalink / raw
To: gentoo-commits
commit: 6ec9b43455867648f01682b5d50b5e9d2c321892
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 7 10:10:07 2022 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Thu Apr 7 10:13:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ec9b434
dev-util/perf: drop unused prefix eclass
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/perf-5.15-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-5.15-r1.ebuild b/dev-util/perf/perf-5.15-r1.ebuild
index d3d3cab43544..e84ed5803f1a 100644
--- a/dev-util/perf/perf-5.15-r1.ebuild
+++ b/dev-util/perf/perf-5.15-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{7..10} )
-inherit bash-completion-r1 estack llvm toolchain-funcs prefix python-r1 linux-info
+inherit bash-completion-r1 estack llvm toolchain-funcs python-r1 linux-info
DESCRIPTION="Userland tools for Linux Performance Counters"
HOMEPAGE="https://perf.wiki.kernel.org/"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2022-04-07 10:14 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2022-04-07 10:14 UTC (permalink / raw
To: gentoo-commits
commit: 44088fd8ed7042585ab75621af4963088b233b3c
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 7 10:06:47 2022 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Thu Apr 7 10:13:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44088fd8
dev-util/perf: drop old 5.12 version
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/Manifest | 1 -
dev-util/perf/perf-5.12-r1.ebuild | 267 --------------------------------------
2 files changed, 268 deletions(-)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 24040411703d..9ace92f65995 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,4 +1,3 @@
-DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
diff --git a/dev-util/perf/perf-5.12-r1.ebuild b/dev-util/perf/perf-5.12-r1.ebuild
deleted file mode 100644
index 3d3079203e9d..000000000000
--- a/dev-util/perf/perf-5.12-r1.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit bash-completion-r1 estack llvm toolchain-funcs prefix python-r1 linux-info
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
- LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
- PATCH_VERSION=$(ver_cut 1-3)
- LINUX_PATCH=patch-${PV//_/-}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
- https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ ${PV} == *.*.* ]] ; then
- # stable-release series
- LINUX_VER=$(ver_cut 1-2)
- LINUX_PATCH=patch-${PV}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
- LINUX_VER=${PV}
- SRC_URI=""
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-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 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
- ${LINUX_PATCH+dev-util/patchutils}
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- doc? (
- app-text/asciidoc
- app-text/sgml-common
- app-text/xmlto
- sys-process/time
- )
- ${PYTHON_DEPS}
-"
-
-RDEPEND="audit? ( sys-process/audit )
- babeltrace? ( dev-util/babeltrace )
- crypt? ( virtual/libcrypt:= )
- clang? (
- <sys-devel/clang-10:*
- <sys-devel/llvm-10:*
- )
- gtk? ( x11-libs/gtk+:2 )
- java? ( virtual/jre:* )
- libpfm? ( dev-libs/libpfm )
- lzma? ( app-arch/xz-utils )
- numa? ( sys-process/numactl )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- slang? ( sys-libs/slang )
- systemtap? ( dev-util/systemtap )
- unwind? ( sys-libs/libunwind )
- zlib? ( sys-libs/zlib )
- zstd? ( app-arch/zstd )
- dev-libs/elfutils
- sys-libs/binutils-libs:="
-
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-5.10
- java? ( virtual/jdk )
-"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-QA_FLAGS_IGNORED=(
- usr/bin/perf-read-vdso32 # not linked with anything except for libc
- usr/libexec/perf-core/dlfilters/dlfilter-test-api-v0.so # not installed
-)
-
-pkg_pretend() {
- if ! use doc ; then
- ewarn "Without the doc USE flag you won't get any documentation nor man pages."
- ewarn "And without man pages, you won't get any --help output for perf and its"
- ewarn "sub-tools."
- fi
-}
-
-pkg_setup() {
- use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
- # We enable python unconditionally as libbpf always generates
- # API headers using python script
- python_setup
-}
-
-# src_unpack and src_prepare are copied to dev-util/bpftool since
-# it's building from the same tarball, please keep it in sync with bpftool
-src_unpack() {
- local paths=(
- tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
- scripts include lib "arch/*/lib"
- )
-
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
- > ${P}.patch
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- 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
- # into the kernel, so it wants an ARCH that looks like the kernel arch,
- # but it also wants to know about the split value -- i386/x86_64 vs just
- # x86. We can get that by telling the func to use an older linux version.
- # It's kind of a hack, but not that bad ...
-
- # LIBDIR sets a search path of perf-gtk.so. Bug 515954
-
- local arch=$(tc-arch-kernel)
- local java_dir
- use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
- # FIXME: NO_CORESIGHT
- 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)" \
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \
- prefix="${EPREFIX}/usr" bindir_relative="bin" \
- tipdir="share/doc/${PF}" \
- EXTRA_CFLAGS="${CFLAGS}" \
- EXTRA_LDFLAGS="${LDFLAGS}" \
- ARCH="${arch}" \
- JDIR="${java_dir}" \
- LIBCLANGLLVM=$(usex clang 1 "") \
- LIBPFM4=$(usex libpfm 1 "") \
- NO_AUXTRACE="" \
- NO_BACKTRACE="" \
- NO_CORESIGHT=1 \
- NO_DEMANGLE= \
- GTK2=$(usex gtk 1 "") \
- feature-gtk2-infobar=$(usex gtk 1 "") \
- NO_JVMTI=$(puse java) \
- NO_LIBAUDIT=$(puse audit) \
- NO_LIBBABELTRACE=$(puse babeltrace) \
- NO_LIBBIONIC=1 \
- NO_LIBBPF= \
- NO_LIBCRYPTO=$(puse crypt) \
- NO_LIBDW_DWARF_UNWIND= \
- NO_LIBELF= \
- NO_LIBNUMA=$(puse numa) \
- NO_LIBPERL=$(puse perl) \
- NO_LIBPYTHON=$(puse python) \
- NO_LIBUNWIND=$(puse unwind) \
- NO_LIBZSTD=$(puse zstd) \
- NO_SDT=$(puse systemtap) \
- NO_SLANG=$(puse slang) \
- NO_LZMA=$(puse lzma) \
- NO_ZLIB=$(puse zlib) \
- WERROR=0 \
- LIBDIR="/usr/libexec/perf-core" \
- libdir="${EPREFIX}/usr/$(get_libdir)" \
- plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins" \
- "$@"
-}
-
-src_compile() {
- # test-clang.bin not build with g++
- if use clang; then
- pushd "${S_K}/tools/build/feature/" || die
- make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
- popd
- fi
- perf_make -f Makefile.perf
- use doc && perf_make -C Documentation man
-}
-
-src_test() {
- :
-}
-
-src_install() {
- _install_python_ext() {
- perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
- }
-
- perf_make -f Makefile.perf install DESTDIR="${D}"
-
- if use python; then
- python_foreach_impl _install_python_ext
- fi
-
- if use gtk; then
- local libdir
- libdir="$(get_libdir)"
- # on some arches it ends up in lib even on 64bit, ppc64 for instance.
- [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
- mv "${ED}"/usr/${libdir}/libperf-gtk.so \
- "${ED}"/usr/libexec/perf-core || die
- fi
-
- dodoc CREDITS
-
- dodoc *txt Documentation/*.txt
-
- # perf needs this decompressed to print out tips for users
- docompress -x /usr/share/doc/${PF}/tips.txt
-
- if use doc ; then
- doman Documentation/*.1
- fi
-}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2022-04-07 13:34 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2022-04-07 13:34 UTC (permalink / raw
To: gentoo-commits
commit: df6d26ee7c2780cab1e1eddb2f8f72dbd9d5cafc
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 7 12:36:52 2022 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Thu Apr 7 13:33:46 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df6d26ee
dev-util/perf: fix bug #837086
Closes: https://bugs.gentoo.org/837086
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/perf-5.17.1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-util/perf/perf-5.17.1.ebuild b/dev-util/perf/perf-5.17.1.ebuild
index 042f82100eba..a2e565d93fcb 100644
--- a/dev-util/perf/perf-5.17.1.ebuild
+++ b/dev-util/perf/perf-5.17.1.ebuild
@@ -83,8 +83,8 @@ S="${S_K}/tools/perf"
CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
QA_FLAGS_IGNORED=(
- usr/bin/perf-read-vdso32 # not linked with anything except for libc
- usr/libexec/perf-core/dlfilters/dlfilter-test-api-v0.so # not installed
+ 'usr/bin/perf-read-vdso32' # not linked with anything except for libc
+ 'usr/libexec/perf-core/dlfilters/.*' # plugins
)
pkg_pretend() {
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2022-05-31 15:36 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2022-05-31 15:36 UTC (permalink / raw
To: gentoo-commits
commit: 242122bac22ac2413031d74623afbdfb1b13ea50
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 15:35:17 2022 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Tue May 31 15:35:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=242122ba
dev-util/perf: drop old 5.8 version
Needs llvm <= 9, which is not in the tree anymore.
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/Manifest | 1 -
dev-util/perf/metadata.xml | 6 --
dev-util/perf/perf-5.8.ebuild | 244 ------------------------------------------
3 files changed, 251 deletions(-)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 87441f010c2a..708e858709e9 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,5 +1,4 @@
DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
-DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
DIST patch-5.17.1.xz 15244 BLAKE2B f340b8a103754122153dd381fe210b18ba37b7262dae4fc7a1f99c5a62868c9bdb178e83865b35f00b82bd2d67ae127c440515d1740093825f7ec7fa4c4a490d SHA512 fb9a28ce7c68daeca82586e7631dc0be00a1a8393b4cef4c659fc1f9dac6e1f941bd60671c0350d1dea9cb035f56d627f64a394a9acb00b2b5dea8a1d44c065f
diff --git a/dev-util/perf/metadata.xml b/dev-util/perf/metadata.xml
index 30edb4656ca7..795d980412ee 100644
--- a/dev-util/perf/metadata.xml
+++ b/dev-util/perf/metadata.xml
@@ -20,12 +20,6 @@
<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
- <pkg>sys-devel/binutils</pkg>. When this flag is enabled, the
- package will have to be rebuilt after every version bump of
- binutils.
- </flag>
<flag name="doc">
Build documentation and man pages. With this USE flag disabled,
the --help parameter for perf and its sub-tools will not be
diff --git a/dev-util/perf/perf-5.8.ebuild b/dev-util/perf/perf-5.8.ebuild
deleted file mode 100644
index 38ceee391a81..000000000000
--- a/dev-util/perf/perf-5.8.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit bash-completion-r1 estack llvm toolchain-funcs prefix python-r1 linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
- LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
- PATCH_VERSION=$(ver_cut 1-3)
- LINUX_PATCH=patch-${PV//_/-}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
- https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ ${PV} == *.*.* ]] ; then
- # stable-release series
- LINUX_VER=$(ver_cut 1-2)
- LINUX_PATCH=patch-${PV}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
- LINUX_VER=${PV}
- SRC_URI=""
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit clang crypt debug +demangle +doc gtk java lzma numa perl python slang systemtap unwind zlib"
-# TODO babeltrace
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
- crypt? ( dev-libs/openssl:0= )
- clang? (
- <sys-devel/clang-10:*
- <sys-devel/llvm-10:*
- )
- demangle? ( sys-libs/binutils-libs:= )
- gtk? ( x11-libs/gtk+:2 )
- java? ( virtual/jre:* )
- lzma? ( app-arch/xz-utils )
- numa? ( sys-process/numactl )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- slang? ( sys-libs/slang )
- systemtap? ( dev-util/systemtap )
- 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
- virtual/pkgconfig
- 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"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-pkg_setup() {
- use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
-}
-
-src_unpack() {
- local paths=(
- tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
- scripts include lib "arch/*/lib"
- )
-
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
- > ${P}.patch
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- 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
- echo "#define PERF_VERSION \"${MY_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
- # into the kernel, so it wants an ARCH that looks like the kernel arch,
- # but it also wants to know about the split value -- i386/x86_64 vs just
- # x86. We can get that by telling the func to use an older linux version.
- # It's kind of a hack, but not that bad ...
-
- # LIBDIR sets a search path of perf-gtk.so. Bug 515954
-
- local arch=$(tc-arch-kernel)
- local java_dir
- use java && java_dir="/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)" \
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \
- prefix="${EPREFIX}/usr" bindir_relative="bin" \
- EXTRA_CFLAGS="${CFLAGS}" \
- ARCH="${arch}" \
- JDIR="${java_dir}" \
- LIBCLANGLLVM=$(usex clang 1 "") \
- NO_AUXTRACE="" \
- NO_BACKTRACE="" \
- NO_CORESIGHT=1 \
- NO_DEMANGLE=$(puse demangle) \
- NO_GTK2=$(puse gtk) \
- NO_JVMTI=$(puse java) \
- NO_LIBAUDIT=$(puse audit) \
- NO_LIBBABELTRACE=1 \
- NO_LIBBIONIC=1 \
- NO_LIBBPF="" \
- NO_LIBCRYPTO=$(puse crypt) \
- NO_LIBDW_DWARF_UNWIND="" \
- NO_LIBELF="" \
- NO_LIBNUMA=$(puse numa) \
- NO_LIBPERL=$(puse perl) \
- NO_LIBPYTHON=$(puse python) \
- NO_LIBUNWIND=$(puse unwind) \
- NO_SDT=$(puse systemtap) \
- NO_SLANG=$(puse slang) \
- NO_LZMA=$(puse lzma) \
- NO_ZLIB= \
- WERROR=0 \
- LIBDIR="/usr/libexec/perf-core" \
- libdir="${EPREFIX}/usr/$(get_libdir)" \
- plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins" \
- "$@"
-}
-
-src_compile() {
- # test-clang.bin not build with g++
- if use clang; then
- pushd "${S_K}/tools/build/feature/" || die
- make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
- popd
- fi
- perf_make -f Makefile.perf
- use doc && perf_make -C Documentation
-}
-
-src_test() {
- :
-}
-
-src_install() {
- _install_python_ext() {
- perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
- }
-
- perf_make -f Makefile.perf install DESTDIR="${D}"
- if use python; then
- python_foreach_impl _install_python_ext
- fi
-
- rm -rv "${ED}"/usr/share/doc/perf-tip || die
-
- if use gtk; then
- local libdir
- libdir="$(get_libdir)"
- # on some arches it ends up in lib even on 64bit, ppc64 for instance.
- [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
- mv "${ED}"/usr/${libdir}/libperf-gtk.so \
- "${ED}"/usr/libexec/perf-core || die
- fi
-
- dodoc CREDITS
-
- dodoc *txt Documentation/*.txt
- if use doc ; then
- HTML_DOCS="Documentation/*.html" einstalldocs
- doman Documentation/*.1
- fi
-}
-
-pkg_postinst() {
- if ! use doc ; then
- elog "Without the doc USE flag you won't get any documentation nor man pages."
- elog "And without man pages, you won't get any --help output for perf and its"
- elog "sub-tools."
- fi
-}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2022-05-31 15:36 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2022-05-31 15:36 UTC (permalink / raw
To: gentoo-commits
commit: 7516c4570bde60614d7be4a229e016c71c90ceab
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 15:28:20 2022 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Tue May 31 15:28:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7516c457
dev-util/perf: restrict llvm version for perf 5.15, bug 836402
Closes: https://bugs.gentoo.org/836402
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/perf-5.15-r1.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-util/perf/perf-5.15-r1.ebuild b/dev-util/perf/perf-5.15-r1.ebuild
index e84ed5803f1a..21985387f161 100644
--- a/dev-util/perf/perf-5.15-r1.ebuild
+++ b/dev-util/perf/perf-5.15-r1.ebuild
@@ -54,8 +54,8 @@ RDEPEND="audit? ( sys-process/audit )
babeltrace? ( dev-util/babeltrace )
crypt? ( virtual/libcrypt:= )
clang? (
- sys-devel/clang:=
- sys-devel/llvm:=
+ <sys-devel/clang-14:=
+ <sys-devel/llvm-14:=
)
gtk? ( x11-libs/gtk+:2 )
java? ( virtual/jre:* )
@@ -96,7 +96,7 @@ pkg_pretend() {
}
pkg_setup() {
- use clang && llvm_pkg_setup
+ use clang && LLVM_MAX_SLOT=13 llvm_pkg_setup
# We enable python unconditionally as libbpf always generates
# API headers using python script
python_setup
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2022-06-16 9:34 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2022-06-16 9:34 UTC (permalink / raw
To: gentoo-commits
commit: 12fd68f5ccf1ae5ab9d364ca2800fd86c1c4b6d9
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 16 09:09:18 2022 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 09:34:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12fd68f5
dev-util/perf: use at sign as delimiter in sed commands
Closes: https://bugs.gentoo.org/832165
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/perf-5.15-r1.ebuild | 4 ++--
dev-util/perf/perf-5.17.1.ebuild | 4 ++--
dev-util/perf/perf-5.18.ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dev-util/perf/perf-5.15-r1.ebuild b/dev-util/perf/perf-5.15-r1.ebuild
index 21985387f161..9f1e52387618 100644
--- a/dev-util/perf/perf-5.15-r1.ebuild
+++ b/dev-util/perf/perf-5.15-r1.ebuild
@@ -150,10 +150,10 @@ src_prepare() {
# Drop some upstream too-developer-oriented flags and fix the
# Makefile in general
sed -i \
- -e "s:\$(sysconfdir_SQ)/bash_completion.d:$(get_bashcompdir):" \
+ -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::' \
+ sed -i -e 's@-Werror@@' \
"${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die
# Avoid the call to make kernelversion
diff --git a/dev-util/perf/perf-5.17.1.ebuild b/dev-util/perf/perf-5.17.1.ebuild
index a2e565d93fcb..773d205044fc 100644
--- a/dev-util/perf/perf-5.17.1.ebuild
+++ b/dev-util/perf/perf-5.17.1.ebuild
@@ -148,10 +148,10 @@ src_prepare() {
# Drop some upstream too-developer-oriented flags and fix the
# Makefile in general
sed -i \
- -e "s:\$(sysconfdir_SQ)/bash_completion.d:$(get_bashcompdir):" \
+ -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::' \
+ sed -i -e 's@-Werror@@' \
"${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die
# Avoid the call to make kernelversion
diff --git a/dev-util/perf/perf-5.18.ebuild b/dev-util/perf/perf-5.18.ebuild
index a2e565d93fcb..773d205044fc 100644
--- a/dev-util/perf/perf-5.18.ebuild
+++ b/dev-util/perf/perf-5.18.ebuild
@@ -148,10 +148,10 @@ src_prepare() {
# Drop some upstream too-developer-oriented flags and fix the
# Makefile in general
sed -i \
- -e "s:\$(sysconfdir_SQ)/bash_completion.d:$(get_bashcompdir):" \
+ -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::' \
+ sed -i -e 's@-Werror@@' \
"${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die
# Avoid the call to make kernelversion
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2022-09-05 0:43 Sam James
0 siblings, 0 replies; 141+ messages in thread
From: Sam James @ 2022-09-05 0:43 UTC (permalink / raw
To: gentoo-commits
commit: 3d1fd30a252e122a5c5b1a7cb8aaae8597f7fdbb
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 5 00:40:56 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 5 00:40:56 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d1fd30a
dev-util/perf: add 5.19
Closes: https://bugs.gentoo.org/868129
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/perf/Manifest | 2 +
dev-util/perf/perf-5.19.ebuild | 269 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 271 insertions(+)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 708e858709e9..574328166e9b 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,4 +1,6 @@
DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
+DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
DIST patch-5.17.1.xz 15244 BLAKE2B f340b8a103754122153dd381fe210b18ba37b7262dae4fc7a1f99c5a62868c9bdb178e83865b35f00b82bd2d67ae127c440515d1740093825f7ec7fa4c4a490d SHA512 fb9a28ce7c68daeca82586e7631dc0be00a1a8393b4cef4c659fc1f9dac6e1f941bd60671c0350d1dea9cb035f56d627f64a394a9acb00b2b5dea8a1d44c065f
+DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e SHA512 af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b
diff --git a/dev-util/perf/perf-5.19.ebuild b/dev-util/perf/perf-5.19.ebuild
new file mode 100644
index 000000000000..48881f1dc0f8
--- /dev/null
+++ b/dev-util/perf/perf-5.19.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit bash-completion-r1 estack llvm toolchain-funcs python-r1 linux-info
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+ LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+ PATCH_VERSION=$(ver_cut 1-3)
+ LINUX_PATCH=patch-${PV//_/-}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+ https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ ${PV} == *.*.* ]] ; then
+ # stable-release series
+ LINUX_VER=$(ver_cut 1-2)
+ LINUX_PATCH=patch-${PV}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+ LINUX_VER=${PV}
+ SRC_URI=""
+ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-binutils-2.39-patches.tar.xz"
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+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 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+ ${LINUX_PATCH+dev-util/patchutils}
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+ doc? (
+ app-text/asciidoc
+ app-text/sgml-common
+ app-text/xmlto
+ sys-process/time
+ )
+ ${PYTHON_DEPS}
+"
+
+RDEPEND="audit? ( sys-process/audit )
+ babeltrace? ( dev-util/babeltrace )
+ crypt? ( virtual/libcrypt:= )
+ clang? (
+ sys-devel/clang:=
+ sys-devel/llvm:=
+ )
+ gtk? ( x11-libs/gtk+:2 )
+ java? ( virtual/jre:* )
+ libpfm? ( dev-libs/libpfm )
+ lzma? ( app-arch/xz-utils )
+ numa? ( sys-process/numactl )
+ perl? ( dev-lang/perl:= )
+ python? ( ${PYTHON_DEPS} )
+ slang? ( sys-libs/slang )
+ systemtap? ( dev-util/systemtap )
+ unwind? ( sys-libs/libunwind )
+ zlib? ( sys-libs/zlib )
+ zstd? ( app-arch/zstd )
+ dev-libs/elfutils
+ sys-libs/binutils-libs:="
+
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-5.10
+ java? ( virtual/jdk )
+"
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
+CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+
+QA_FLAGS_IGNORED=(
+ 'usr/bin/perf-read-vdso32' # not linked with anything except for libc
+ 'usr/libexec/perf-core/dlfilters/.*' # plugins
+)
+
+pkg_pretend() {
+ if ! use doc ; then
+ ewarn "Without the doc USE flag you won't get any documentation nor man pages."
+ ewarn "And without man pages, you won't get any --help output for perf and its"
+ ewarn "sub-tools."
+ fi
+}
+
+pkg_setup() {
+ use clang && llvm_pkg_setup
+ # We enable python unconditionally as libbpf always generates
+ # API headers using python script
+ python_setup
+}
+
+# src_unpack and src_prepare are copied to dev-util/bpftool since
+# it's building from the same tarball, please keep it in sync with bpftool
+src_unpack() {
+ local paths=(
+ tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
+ scripts include lib "arch/*/lib"
+ )
+
+ # We expect the tar implementation to support the -j option (both
+ # GNU tar and libarchive's tar support that).
+ echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+ tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+ "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ eshopts_push -o noglob
+ ebegin "Filtering partial source patch"
+ filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+ > ${P}.patch
+ eend $? || die "filterdiff failed"
+ eshopts_pop
+ fi
+
+ local a
+ for a in ${A}; do
+ [[ ${a} == ${LINUX_SOURCES} ]] && continue
+ [[ ${a} == ${LINUX_PATCH} ]] && continue
+ unpack ${a}
+ done
+}
+
+src_prepare() {
+ default
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ pushd "${S_K}" >/dev/null || die
+ eapply "${WORKDIR}"/${P}.patch
+ popd || die
+ fi
+
+ pushd "${S_K}" >/dev/null || die
+ eapply "${FILESDIR}"/${PN}-5.18-clang.patch
+ rm "${WORKDIR}"/${P}-binutils-2.39-patches/0005-tools-bpf_jit_disasm-Fix-compilation-error-with-new-.patch || die
+ rm "${WORKDIR}"/${P}-binutils-2.39-patches/0006-tools-bpf_jit_disasm-Don-t-display-disassembler-four.patch || die
+ rm "${WORKDIR}"/${P}-binutils-2.39-patches/0007-tools-bpftool-Fix-compilation-error-with-new-binutil.patch || die
+ eapply "${WORKDIR}"/${P}-binutils-2.39-patches
+ popd || die
+
+ # 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' {} +
+}
+
+puse() { usex $1 "" no; }
+perf_make() {
+ # The arch parsing is a bit funky. The perf tools package is integrated
+ # into the kernel, so it wants an ARCH that looks like the kernel arch,
+ # but it also wants to know about the split value -- i386/x86_64 vs just
+ # x86. We can get that by telling the func to use an older linux version.
+ # It's kind of a hack, but not that bad ...
+
+ # LIBDIR sets a search path of perf-gtk.so. Bug 515954
+
+ local arch=$(tc-arch-kernel)
+ local java_dir
+ use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
+ # FIXME: NO_CORESIGHT
+ 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)" \
+ PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+ prefix="${EPREFIX}/usr" bindir_relative="bin" \
+ tipdir="share/doc/${PF}" \
+ EXTRA_CFLAGS="${CFLAGS}" \
+ EXTRA_LDFLAGS="${LDFLAGS}" \
+ ARCH="${arch}" \
+ JDIR="${java_dir}" \
+ LIBCLANGLLVM=$(usex clang 1 "") \
+ LIBPFM4=$(usex libpfm 1 "") \
+ NO_AUXTRACE="" \
+ NO_BACKTRACE="" \
+ NO_CORESIGHT=1 \
+ NO_DEMANGLE= \
+ GTK2=$(usex gtk 1 "") \
+ feature-gtk2-infobar=$(usex gtk 1 "") \
+ NO_JVMTI=$(puse java) \
+ NO_LIBAUDIT=$(puse audit) \
+ NO_LIBBABELTRACE=$(puse babeltrace) \
+ NO_LIBBIONIC=1 \
+ NO_LIBBPF= \
+ NO_LIBCRYPTO=$(puse crypt) \
+ NO_LIBDW_DWARF_UNWIND= \
+ NO_LIBELF= \
+ NO_LIBNUMA=$(puse numa) \
+ NO_LIBPERL=$(puse perl) \
+ NO_LIBPYTHON=$(puse python) \
+ NO_LIBUNWIND=$(puse unwind) \
+ NO_LIBZSTD=$(puse zstd) \
+ NO_SDT=$(puse systemtap) \
+ NO_SLANG=$(puse slang) \
+ NO_LZMA=$(puse lzma) \
+ NO_ZLIB=$(puse zlib) \
+ WERROR=0 \
+ LIBDIR="/usr/libexec/perf-core" \
+ libdir="${EPREFIX}/usr/$(get_libdir)" \
+ plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins" \
+ "$@"
+}
+
+src_compile() {
+ # test-clang.bin not build with g++
+ if use clang; then
+ make -C "${S_K}/tools/build/feature" V=1 CXX=${CHOST}-clang++ test-clang.bin || die
+ fi
+ perf_make -f Makefile.perf
+ use doc && perf_make -C Documentation man
+}
+
+src_test() {
+ :
+}
+
+src_install() {
+ _install_python_ext() {
+ perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
+ }
+
+ perf_make -f Makefile.perf install DESTDIR="${D}"
+
+ if use python; then
+ python_foreach_impl _install_python_ext
+ fi
+
+ if use gtk; then
+ local libdir
+ libdir="$(get_libdir)"
+ # on some arches it ends up in lib even on 64bit, ppc64 for instance.
+ [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
+ mv "${ED}"/usr/${libdir}/libperf-gtk.so \
+ "${ED}"/usr/libexec/perf-core || die
+ fi
+
+ dodoc CREDITS
+
+ dodoc *txt Documentation/*.txt
+
+ # perf needs this decompressed to print out tips for users
+ docompress -x /usr/share/doc/${PF}/tips.txt
+
+ if use doc ; then
+ doman Documentation/*.1
+ fi
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2022-09-05 1:14 Sam James
0 siblings, 0 replies; 141+ messages in thread
From: Sam James @ 2022-09-05 1:14 UTC (permalink / raw
To: gentoo-commits
commit: 6707360d2ee62f70b0320073a80e46dc92ef83fe
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 5 01:13:42 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 5 01:13:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6707360d
dev-util/perf: add comment re binutils-2.39 patches
Bug: https://bugs.gentoo.org/868129
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/perf/perf-5.19.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dev-util/perf/perf-5.19.ebuild b/dev-util/perf/perf-5.19.ebuild
index 48881f1dc0f8..c0b17711b75c 100644
--- a/dev-util/perf/perf-5.19.ebuild
+++ b/dev-util/perf/perf-5.19.ebuild
@@ -144,6 +144,8 @@ src_prepare() {
pushd "${S_K}" >/dev/null || die
eapply "${FILESDIR}"/${PN}-5.18-clang.patch
+ # Used `git format-patch 00b32625982e0c796f0abb8effcac9c05ef55bd3...600b7b26c07a070d0153daa76b3806c1e52c9e00`
+ # bug #868129
rm "${WORKDIR}"/${P}-binutils-2.39-patches/0005-tools-bpf_jit_disasm-Fix-compilation-error-with-new-.patch || die
rm "${WORKDIR}"/${P}-binutils-2.39-patches/0006-tools-bpf_jit_disasm-Don-t-display-disassembler-four.patch || die
rm "${WORKDIR}"/${P}-binutils-2.39-patches/0007-tools-bpftool-Fix-compilation-error-with-new-binutil.patch || die
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2022-11-16 8:52 Arthur Zamarin
0 siblings, 0 replies; 141+ messages in thread
From: Arthur Zamarin @ 2022-11-16 8:52 UTC (permalink / raw
To: gentoo-commits
commit: 8a3900732159b9d74b07d4c034fd3c8ddef5c635
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 16 08:52:32 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 08:52:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a390073
dev-util/perf: Stabilize 5.19 ppc64, #876166
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-util/perf/perf-5.19.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-5.19.ebuild b/dev-util/perf/perf-5.19.ebuild
index c0b17711b75c..9800fe542ce6 100644
--- a/dev-util/perf/perf-5.19.ebuild
+++ b/dev-util/perf/perf-5.19.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 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2022-11-16 8:52 Arthur Zamarin
0 siblings, 0 replies; 141+ messages in thread
From: Arthur Zamarin @ 2022-11-16 8:52 UTC (permalink / raw
To: gentoo-commits
commit: 226aa377f02331314d9c753fb18e1faa27fd0e95
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 16 08:52:33 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 08:52:33 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=226aa377
dev-util/perf: Stabilize 5.19 arm, #876166
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-util/perf/perf-5.19.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-5.19.ebuild b/dev-util/perf/perf-5.19.ebuild
index 9800fe542ce6..a64b5e9ba186 100644
--- a/dev-util/perf/perf-5.19.ebuild
+++ b/dev-util/perf/perf-5.19.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 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm ~arm64 ~mips ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2022-11-16 8:56 Arthur Zamarin
0 siblings, 0 replies; 141+ messages in thread
From: Arthur Zamarin @ 2022-11-16 8:56 UTC (permalink / raw
To: gentoo-commits
commit: 202b5b184a45233ff9e63e15d69427e4c145c0d4
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 16 08:56:52 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 08:56:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=202b5b18
dev-util/perf: Stabilize 5.19 ppc, #876166
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-util/perf/perf-5.19.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-5.19.ebuild b/dev-util/perf/perf-5.19.ebuild
index a64b5e9ba186..81b624d2a5d4 100644
--- a/dev-util/perf/perf-5.19.ebuild
+++ b/dev-util/perf/perf-5.19.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 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm ~arm64 ~mips ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2022-11-16 12:41 Sam James
0 siblings, 0 replies; 141+ messages in thread
From: Sam James @ 2022-11-16 12:41 UTC (permalink / raw
To: gentoo-commits
commit: 650d34da67b231d1b24e2792572a323fea05ae02
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 16 12:40:55 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 12:40:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=650d34da
dev-util/perf: Stabilize 5.19 amd64, #876166
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/perf/perf-5.19.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-5.19.ebuild b/dev-util/perf/perf-5.19.ebuild
index 8bcbce310ab9..dae347e98cf6 100644
--- a/dev-util/perf/perf-5.19.ebuild
+++ b/dev-util/perf/perf-5.19.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 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2022-11-16 12:41 Sam James
0 siblings, 0 replies; 141+ messages in thread
From: Sam James @ 2022-11-16 12:41 UTC (permalink / raw
To: gentoo-commits
commit: fbd4c3ea5d25674ac232c3b8c3f919b999b18b7e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 16 12:40:53 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 12:40:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbd4c3ea
dev-util/perf: Stabilize 5.19 x86, #876166
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/perf/perf-5.19.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-5.19.ebuild b/dev-util/perf/perf-5.19.ebuild
index 81b624d2a5d4..8bcbce310ab9 100644
--- a/dev-util/perf/perf-5.19.ebuild
+++ b/dev-util/perf/perf-5.19.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 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm ~arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2022-11-17 1:06 Sam James
0 siblings, 0 replies; 141+ messages in thread
From: Sam James @ 2022-11-17 1:06 UTC (permalink / raw
To: gentoo-commits
commit: c3a289eb916dfb55e420a1d7f269d8fd2e904c42
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 17 01:05:42 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 17 01:05:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3a289eb
dev-util/perf: Stabilize 5.19 arm64, #876166
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/perf/perf-5.19.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-5.19.ebuild b/dev-util/perf/perf-5.19.ebuild
index dae347e98cf6..a1b75fd9e59e 100644
--- a/dev-util/perf/perf-5.19.ebuild
+++ b/dev-util/perf/perf-5.19.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 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-01-13 15:27 Naohiro Aota
0 siblings, 0 replies; 141+ messages in thread
From: Naohiro Aota @ 2023-01-13 15:27 UTC (permalink / raw
To: gentoo-commits
commit: 89389a9fc60661d2bb0b9590e012cf75cbe1960b
Author: Naohiro Aota <naota <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 15:25:47 2023 +0000
Commit: Naohiro Aota <naota <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 15:26:58 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89389a9f
dev-util/perf: drop -Werror from Makefile
Closes: https://bugs.gentoo.org/888837
Signed-off-by: Naohiro Aota <naota <AT> gentoo.org>
dev-util/perf/perf-6.0.ebuild | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dev-util/perf/perf-6.0.ebuild b/dev-util/perf/perf-6.0.ebuild
index 7436087635dc..0f780281f20f 100644
--- a/dev-util/perf/perf-6.0.ebuild
+++ b/dev-util/perf/perf-6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -152,7 +152,8 @@ src_prepare() {
"${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
+ "${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile \
+ "${S_K}"/tools/lib/perf/Makefile || die
# Avoid the call to make kernelversion
sed -i -e '/PERF-VERSION-GEN/d' Makefile.perf || die
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-02-13 20:09 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2023-02-13 20:09 UTC (permalink / raw
To: gentoo-commits
commit: c417271f441f6dbeba99aeaf37c190e6ec22c7bb
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 13 20:09:28 2023 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 20:09:34 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c417271f
dev-util/perf: add 6.1.11
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/Manifest | 2 +
dev-util/perf/perf-6.1.11.ebuild | 265 +++++++++++++++++++++++++++++++++++++++
2 files changed, 267 insertions(+)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 076d2671e177..3f7683f95648 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,3 +1,5 @@
DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
+DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
+DIST patch-6.1.11.xz 717696 BLAKE2B 57033764612efc0a173f501036ccd6cc4fb1ddb452f40d3d81cfea7c3d918174a6b242490fbb8b0c66eb91c4e6503b820b0e77ba12c3beeea95b492b662f3466 SHA512 3ea57aa49805a2ed9521b11237e70e2df68cff5c3215e5e047ec292daaa1caace6747219fbec6cdef84b099d607bc59ac7f9a7e72189fc269945586ee16ab899
DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e SHA512 af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b
diff --git a/dev-util/perf/perf-6.1.11.ebuild b/dev-util/perf/perf-6.1.11.ebuild
new file mode 100644
index 000000000000..bff4ba7118b7
--- /dev/null
+++ b/dev-util/perf/perf-6.1.11.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit bash-completion-r1 estack llvm toolchain-funcs python-r1 linux-info
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+ LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+ PATCH_VERSION=$(ver_cut 1-3)
+ LINUX_PATCH=patch-${PV//_/-}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+ https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ ${PV} == *.*.* ]] ; then
+ # stable-release series
+ LINUX_VER=$(ver_cut 1-2)
+ LINUX_PATCH=patch-${PV}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+ LINUX_VER=${PV}
+ SRC_URI=""
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+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 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+ ${LINUX_PATCH+dev-util/patchutils}
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+ doc? (
+ app-text/asciidoc
+ app-text/sgml-common
+ app-text/xmlto
+ sys-process/time
+ )
+ ${PYTHON_DEPS}
+"
+
+RDEPEND="audit? ( sys-process/audit )
+ babeltrace? ( dev-util/babeltrace )
+ crypt? ( virtual/libcrypt:= )
+ clang? (
+ sys-devel/clang:=
+ sys-devel/llvm:=
+ )
+ gtk? ( x11-libs/gtk+:2 )
+ java? ( virtual/jre:* )
+ libpfm? ( dev-libs/libpfm )
+ lzma? ( app-arch/xz-utils )
+ numa? ( sys-process/numactl )
+ perl? ( dev-lang/perl:= )
+ python? ( ${PYTHON_DEPS} )
+ slang? ( sys-libs/slang )
+ systemtap? ( dev-util/systemtap )
+ unwind? ( sys-libs/libunwind )
+ zlib? ( sys-libs/zlib )
+ zstd? ( app-arch/zstd )
+ dev-libs/elfutils
+ sys-libs/binutils-libs:="
+
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-5.10
+ java? ( virtual/jdk )
+"
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
+CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+
+QA_FLAGS_IGNORED=(
+ 'usr/bin/perf-read-vdso32' # not linked with anything except for libc
+ 'usr/libexec/perf-core/dlfilters/.*' # plugins
+)
+
+pkg_pretend() {
+ if ! use doc ; then
+ ewarn "Without the doc USE flag you won't get any documentation nor man pages."
+ ewarn "And without man pages, you won't get any --help output for perf and its"
+ ewarn "sub-tools."
+ fi
+}
+
+pkg_setup() {
+ use clang && llvm_pkg_setup
+ # We enable python unconditionally as libbpf always generates
+ # API headers using python script
+ python_setup
+}
+
+# src_unpack and src_prepare are copied to dev-util/bpftool since
+# it's building from the same tarball, please keep it in sync with bpftool
+src_unpack() {
+ local paths=(
+ tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
+ scripts include lib "arch/*/lib"
+ )
+
+ # We expect the tar implementation to support the -j option (both
+ # GNU tar and libarchive's tar support that).
+ echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+ tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+ "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ eshopts_push -o noglob
+ ebegin "Filtering partial source patch"
+ filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+ > ${P}.patch
+ eend $? || die "filterdiff failed"
+ eshopts_pop
+ fi
+
+ local a
+ for a in ${A}; do
+ [[ ${a} == ${LINUX_SOURCES} ]] && continue
+ [[ ${a} == ${LINUX_PATCH} ]] && continue
+ unpack ${a}
+ done
+}
+
+src_prepare() {
+ default
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ pushd "${S_K}" >/dev/null || die
+ eapply "${WORKDIR}"/${P}.patch
+ popd || die
+ fi
+
+ pushd "${S_K}" >/dev/null || die
+ eapply "${FILESDIR}"/perf-6.0-clang.patch
+ popd || die
+
+ # 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 \
+ "${S_K}"/tools/lib/perf/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' {} +
+}
+
+puse() { usex $1 "" no; }
+perf_make() {
+ # The arch parsing is a bit funky. The perf tools package is integrated
+ # into the kernel, so it wants an ARCH that looks like the kernel arch,
+ # but it also wants to know about the split value -- i386/x86_64 vs just
+ # x86. We can get that by telling the func to use an older linux version.
+ # It's kind of a hack, but not that bad ...
+
+ # LIBDIR sets a search path of perf-gtk.so. Bug 515954
+
+ local arch=$(tc-arch-kernel)
+ local java_dir
+ use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
+ # FIXME: NO_CORESIGHT
+ 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)" \
+ PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+ prefix="${EPREFIX}/usr" bindir_relative="bin" \
+ tipdir="share/doc/${PF}" \
+ EXTRA_CFLAGS="${CFLAGS}" \
+ EXTRA_LDFLAGS="${LDFLAGS}" \
+ ARCH="${arch}" \
+ JDIR="${java_dir}" \
+ LIBCLANGLLVM=$(usex clang 1 "") \
+ LIBPFM4=$(usex libpfm 1 "") \
+ NO_AUXTRACE="" \
+ NO_BACKTRACE="" \
+ NO_CORESIGHT=1 \
+ NO_DEMANGLE= \
+ GTK2=$(usex gtk 1 "") \
+ feature-gtk2-infobar=$(usex gtk 1 "") \
+ NO_JVMTI=$(puse java) \
+ NO_LIBAUDIT=$(puse audit) \
+ NO_LIBBABELTRACE=$(puse babeltrace) \
+ NO_LIBBIONIC=1 \
+ NO_LIBBPF= \
+ NO_LIBCRYPTO=$(puse crypt) \
+ NO_LIBDW_DWARF_UNWIND= \
+ NO_LIBELF= \
+ NO_LIBNUMA=$(puse numa) \
+ NO_LIBPERL=$(puse perl) \
+ NO_LIBPYTHON=$(puse python) \
+ NO_LIBUNWIND=$(puse unwind) \
+ NO_LIBZSTD=$(puse zstd) \
+ NO_SDT=$(puse systemtap) \
+ NO_SLANG=$(puse slang) \
+ NO_LZMA=$(puse lzma) \
+ NO_ZLIB=$(puse zlib) \
+ WERROR=0 \
+ LIBDIR="/usr/libexec/perf-core" \
+ libdir="${EPREFIX}/usr/$(get_libdir)" \
+ plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins" \
+ "$@"
+}
+
+src_compile() {
+ # test-clang.bin not build with g++
+ if use clang; then
+ make -C "${S_K}/tools/build/feature" V=1 CXX=${CHOST}-clang++ test-clang.bin || die
+ fi
+ perf_make -f Makefile.perf
+ use doc && perf_make -C Documentation man
+}
+
+src_test() {
+ :
+}
+
+src_install() {
+ _install_python_ext() {
+ perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
+ }
+
+ perf_make -f Makefile.perf install DESTDIR="${D}"
+
+ if use python; then
+ python_foreach_impl _install_python_ext
+ fi
+
+ if use gtk; then
+ local libdir
+ libdir="$(get_libdir)"
+ # on some arches it ends up in lib even on 64bit, ppc64 for instance.
+ [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
+ mv "${ED}"/usr/${libdir}/libperf-gtk.so \
+ "${ED}"/usr/libexec/perf-core || die
+ fi
+
+ dodoc CREDITS
+
+ dodoc *txt Documentation/*.txt
+
+ # perf needs this decompressed to print out tips for users
+ docompress -x /usr/share/doc/${PF}/tips.txt
+
+ if use doc ; then
+ doman Documentation/*.1
+ fi
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-02-23 20:29 Sam James
0 siblings, 0 replies; 141+ messages in thread
From: Sam James @ 2023-02-23 20:29 UTC (permalink / raw
To: gentoo-commits
commit: f1441f011624a20d2cafb3055e9630e949c47247
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 23 17:42:50 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 20:29:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1441f01
dev-util/perf: use gtar for --wildcards
Closes: https://bugs.gentoo.org/887761
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/perf/perf-5.19.ebuild | 2 +-
dev-util/perf/perf-6.0.ebuild | 2 +-
dev-util/perf/perf-6.1.11.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-util/perf/perf-5.19.ebuild b/dev-util/perf/perf-5.19.ebuild
index 69d09a7dfbac..2489e3b3c6d3 100644
--- a/dev-util/perf/perf-5.19.ebuild
+++ b/dev-util/perf/perf-5.19.ebuild
@@ -114,7 +114,7 @@ src_unpack() {
# We expect the tar implementation to support the -j option (both
# GNU tar and libarchive's tar support that).
echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+ gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
"${paths[@]/#/linux-${LINUX_VER}/}" || die
if [[ -n ${LINUX_PATCH} ]] ; then
diff --git a/dev-util/perf/perf-6.0.ebuild b/dev-util/perf/perf-6.0.ebuild
index 8835f1febde4..611ca8224448 100644
--- a/dev-util/perf/perf-6.0.ebuild
+++ b/dev-util/perf/perf-6.0.ebuild
@@ -113,7 +113,7 @@ src_unpack() {
# We expect the tar implementation to support the -j option (both
# GNU tar and libarchive's tar support that).
echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+ gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
"${paths[@]/#/linux-${LINUX_VER}/}" || die
if [[ -n ${LINUX_PATCH} ]] ; then
diff --git a/dev-util/perf/perf-6.1.11.ebuild b/dev-util/perf/perf-6.1.11.ebuild
index bff4ba7118b7..c9df3f9793cf 100644
--- a/dev-util/perf/perf-6.1.11.ebuild
+++ b/dev-util/perf/perf-6.1.11.ebuild
@@ -113,7 +113,7 @@ src_unpack() {
# We expect the tar implementation to support the -j option (both
# GNU tar and libarchive's tar support that).
echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+ gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
"${paths[@]/#/linux-${LINUX_VER}/}" || die
if [[ -n ${LINUX_PATCH} ]] ; then
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-02-28 8:10 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2023-02-28 8:10 UTC (permalink / raw
To: gentoo-commits
commit: 131be2476bcbf2aaf0dd6ad16cefe15800da01d3
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 08:09:39 2023 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 08:10:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=131be247
dev-util/perf: add 6.2, drop 6.1.11
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/Manifest | 3 +--
dev-util/perf/{perf-6.1.11.ebuild => perf-6.2.ebuild} | 0
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 3f7683f95648..c3a52f5a7406 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,5 +1,4 @@
DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
-DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
-DIST patch-6.1.11.xz 717696 BLAKE2B 57033764612efc0a173f501036ccd6cc4fb1ddb452f40d3d81cfea7c3d918174a6b242490fbb8b0c66eb91c4e6503b820b0e77ba12c3beeea95b492b662f3466 SHA512 3ea57aa49805a2ed9521b11237e70e2df68cff5c3215e5e047ec292daaa1caace6747219fbec6cdef84b099d607bc59ac7f9a7e72189fc269945586ee16ab899
+DIST linux-6.2.tar.xz 136430892 BLAKE2B 05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d SHA512 a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd
DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e SHA512 af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b
diff --git a/dev-util/perf/perf-6.1.11.ebuild b/dev-util/perf/perf-6.2.ebuild
similarity index 100%
rename from dev-util/perf/perf-6.1.11.ebuild
rename to dev-util/perf/perf-6.2.ebuild
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-03-02 9:40 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2023-03-02 9:40 UTC (permalink / raw
To: gentoo-commits
commit: bbc9ffb719acf9ae93282de6088e21a671340f72
Author: Denis Pronin <dannftk <AT> yandex <DOT> ru>
AuthorDate: Sun Feb 26 20:50:32 2023 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Thu Mar 2 09:39:37 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbc9ffb7
dev-util/perf-5.19: add python3_11 to PYTHON_COMPAT
Closes: https://github.com/gentoo/gentoo/pull/29879
Signed-off-by: Denis Pronin <dannftk <AT> yandex.ru>
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/perf-5.19.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-5.19.ebuild b/dev-util/perf/perf-5.19.ebuild
index 2489e3b3c6d3..129012be23f9 100644
--- a/dev-util/perf/perf-5.19.ebuild
+++ b/dev-util/perf/perf-5.19.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit bash-completion-r1 estack llvm toolchain-funcs python-r1 linux-info
DESCRIPTION="Userland tools for Linux Performance Counters"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-04-11 2:44 Sam James
0 siblings, 0 replies; 141+ messages in thread
From: Sam James @ 2023-04-11 2:44 UTC (permalink / raw
To: gentoo-commits
commit: da3b75e6e0ebc97ff9bc926756aee926fa44d328
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 11 02:44:02 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 11 02:44:42 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da3b75e6
dev-util/perf: BDEPEND on setuptools
It's always needed in util/*, even for USE=-python.
Closes: https://bugs.gentoo.org/879161
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/perf/{perf-5.19.ebuild => perf-5.19-r1.ebuild} | 4 +++-
dev-util/perf/{perf-6.0.ebuild => perf-6.0-r1.ebuild} | 4 +++-
dev-util/perf/{perf-6.2.ebuild => perf-6.2-r1.ebuild} | 4 +++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/dev-util/perf/perf-5.19.ebuild b/dev-util/perf/perf-5.19-r1.ebuild
similarity index 98%
rename from dev-util/perf/perf-5.19.ebuild
rename to dev-util/perf/perf-5.19-r1.ebuild
index 129012be23f9..ea6fd7e11d61 100644
--- a/dev-util/perf/perf-5.19.ebuild
+++ b/dev-util/perf/perf-5.19-r1.ebuild
@@ -37,8 +37,11 @@ IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl pyt
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+# setuptools (and Python) are always needed even if not building Python bindings
BDEPEND="
${LINUX_PATCH+dev-util/patchutils}
+ ${PYTHON_DEPS}
+ dev-python/setuptools[${PYTHON_USEDEP}]
sys-devel/bison
sys-devel/flex
virtual/pkgconfig
@@ -48,7 +51,6 @@ BDEPEND="
app-text/xmlto
sys-process/time
)
- ${PYTHON_DEPS}
"
RDEPEND="audit? ( sys-process/audit )
diff --git a/dev-util/perf/perf-6.0.ebuild b/dev-util/perf/perf-6.0-r1.ebuild
similarity index 98%
rename from dev-util/perf/perf-6.0.ebuild
rename to dev-util/perf/perf-6.0-r1.ebuild
index 611ca8224448..be9dbc82a5f9 100644
--- a/dev-util/perf/perf-6.0.ebuild
+++ b/dev-util/perf/perf-6.0-r1.ebuild
@@ -36,8 +36,11 @@ IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl pyt
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+# setuptools (and Python) are always needed even if not building Python bindings
BDEPEND="
${LINUX_PATCH+dev-util/patchutils}
+ ${PYTHON_DEPS}
+ dev-python/setuptools[${PYTHON_USEDEP}]
sys-devel/bison
sys-devel/flex
virtual/pkgconfig
@@ -47,7 +50,6 @@ BDEPEND="
app-text/xmlto
sys-process/time
)
- ${PYTHON_DEPS}
"
RDEPEND="audit? ( sys-process/audit )
diff --git a/dev-util/perf/perf-6.2.ebuild b/dev-util/perf/perf-6.2-r1.ebuild
similarity index 98%
rename from dev-util/perf/perf-6.2.ebuild
rename to dev-util/perf/perf-6.2-r1.ebuild
index c9df3f9793cf..8dc6385d598e 100644
--- a/dev-util/perf/perf-6.2.ebuild
+++ b/dev-util/perf/perf-6.2-r1.ebuild
@@ -36,8 +36,11 @@ IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl pyt
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+# setuptools (and Python) are always needed even if not building Python bindings
BDEPEND="
${LINUX_PATCH+dev-util/patchutils}
+ ${PYTHON_DEPS}
+ dev-python/setuptools[${PYTHON_USEDEP}]
sys-devel/bison
sys-devel/flex
virtual/pkgconfig
@@ -47,7 +50,6 @@ BDEPEND="
app-text/xmlto
sys-process/time
)
- ${PYTHON_DEPS}
"
RDEPEND="audit? ( sys-process/audit )
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-05-17 12:41 Yixun Lan
0 siblings, 0 replies; 141+ messages in thread
From: Yixun Lan @ 2023-05-17 12:41 UTC (permalink / raw
To: gentoo-commits
commit: bfbcad6bcfd6751b343f124013d63a3167838d42
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Wed May 17 12:40:58 2023 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Wed May 17 12:41:40 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfbcad6b
dev-util/perf: add 6.3
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
dev-util/perf/Manifest | 1 +
dev-util/perf/perf-6.3.ebuild | 268 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 269 insertions(+)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index c3a52f5a7406..46a7ae78c623 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,4 +1,5 @@
DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
DIST linux-6.2.tar.xz 136430892 BLAKE2B 05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d SHA512 a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd
+DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e SHA512 af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b
diff --git a/dev-util/perf/perf-6.3.ebuild b/dev-util/perf/perf-6.3.ebuild
new file mode 100644
index 000000000000..8a46cf67337d
--- /dev/null
+++ b/dev-util/perf/perf-6.3.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit bash-completion-r1 estack llvm toolchain-funcs python-r1 linux-info
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+ LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+ PATCH_VERSION=$(ver_cut 1-3)
+ LINUX_PATCH=patch-${PV//_/-}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+ https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ ${PV} == *.*.* ]] ; then
+ # stable-release series
+ LINUX_VER=$(ver_cut 1-2)
+ LINUX_PATCH=patch-${PV}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+ LINUX_VER=${PV}
+ SRC_URI=""
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+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 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# setuptools (and Python) are always needed even if not building Python bindings
+BDEPEND="
+ ${LINUX_PATCH+dev-util/patchutils}
+ ${PYTHON_DEPS}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+ doc? (
+ app-text/asciidoc
+ app-text/sgml-common
+ app-text/xmlto
+ sys-process/time
+ )
+"
+
+RDEPEND="audit? ( sys-process/audit )
+ babeltrace? ( dev-util/babeltrace )
+ crypt? ( virtual/libcrypt:= )
+ clang? (
+ sys-devel/clang:=
+ sys-devel/llvm:=
+ )
+ gtk? ( x11-libs/gtk+:2 )
+ java? ( virtual/jre:* )
+ libpfm? ( dev-libs/libpfm )
+ lzma? ( app-arch/xz-utils )
+ numa? ( sys-process/numactl )
+ perl? ( dev-lang/perl:= )
+ python? ( ${PYTHON_DEPS} )
+ slang? ( sys-libs/slang )
+ systemtap? ( dev-util/systemtap )
+ unwind? ( sys-libs/libunwind )
+ zlib? ( sys-libs/zlib )
+ zstd? ( app-arch/zstd )
+ dev-libs/elfutils
+ sys-libs/binutils-libs:="
+
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-5.10
+ java? ( virtual/jdk )
+"
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
+CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+
+QA_FLAGS_IGNORED=(
+ 'usr/bin/perf-read-vdso32' # not linked with anything except for libc
+ 'usr/libexec/perf-core/dlfilters/.*' # plugins
+)
+
+pkg_pretend() {
+ if ! use doc ; then
+ ewarn "Without the doc USE flag you won't get any documentation nor man pages."
+ ewarn "And without man pages, you won't get any --help output for perf and its"
+ ewarn "sub-tools."
+ fi
+}
+
+pkg_setup() {
+ use clang && llvm_pkg_setup
+ # We enable python unconditionally as libbpf always generates
+ # API headers using python script
+ python_setup
+}
+
+# src_unpack and src_prepare are copied to dev-util/bpftool since
+# it's building from the same tarball, please keep it in sync with bpftool
+src_unpack() {
+ local paths=(
+ tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
+ scripts include lib "arch/*/lib"
+ )
+
+ # We expect the tar implementation to support the -j option (both
+ # GNU tar and libarchive's tar support that).
+ echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+ gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+ "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ eshopts_push -o noglob
+ ebegin "Filtering partial source patch"
+ filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+ > ${P}.patch
+ eend $? || die "filterdiff failed"
+ eshopts_pop
+ fi
+
+ local a
+ for a in ${A}; do
+ [[ ${a} == ${LINUX_SOURCES} ]] && continue
+ [[ ${a} == ${LINUX_PATCH} ]] && continue
+ unpack ${a}
+ done
+}
+
+src_prepare() {
+ default
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ pushd "${S_K}" >/dev/null || die
+ eapply "${WORKDIR}"/${P}.patch
+ popd || die
+ fi
+
+ pushd "${S_K}" >/dev/null || die
+ eapply "${FILESDIR}"/perf-6.0-clang.patch
+ eapply "${FILESDIR}"/perf-6.0-c++17.patch
+ popd || die
+
+ # 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 \
+ "${S_K}"/tools/lib/perf/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' {} +
+}
+
+puse() { usex $1 "" no; }
+perf_make() {
+ # The arch parsing is a bit funky. The perf tools package is integrated
+ # into the kernel, so it wants an ARCH that looks like the kernel arch,
+ # but it also wants to know about the split value -- i386/x86_64 vs just
+ # x86. We can get that by telling the func to use an older linux version.
+ # It's kind of a hack, but not that bad ...
+
+ # LIBDIR sets a search path of perf-gtk.so. Bug 515954
+
+ local arch=$(tc-arch-kernel)
+ local java_dir
+ use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
+ # FIXME: NO_CORESIGHT
+ 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)" \
+ PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+ prefix="${EPREFIX}/usr" bindir_relative="bin" \
+ tipdir="share/doc/${PF}" \
+ EXTRA_CFLAGS="${CFLAGS}" \
+ EXTRA_LDFLAGS="${LDFLAGS}" \
+ ARCH="${arch}" \
+ JDIR="${java_dir}" \
+ LIBCLANGLLVM=$(usex clang 1 "") \
+ LIBPFM4=$(usex libpfm 1 "") \
+ NO_AUXTRACE="" \
+ NO_BACKTRACE="" \
+ NO_CORESIGHT=1 \
+ NO_DEMANGLE= \
+ GTK2=$(usex gtk 1 "") \
+ feature-gtk2-infobar=$(usex gtk 1 "") \
+ NO_JVMTI=$(puse java) \
+ NO_LIBAUDIT=$(puse audit) \
+ NO_LIBBABELTRACE=$(puse babeltrace) \
+ NO_LIBBIONIC=1 \
+ NO_LIBBPF= \
+ NO_LIBCRYPTO=$(puse crypt) \
+ NO_LIBDW_DWARF_UNWIND= \
+ NO_LIBELF= \
+ NO_LIBNUMA=$(puse numa) \
+ NO_LIBPERL=$(puse perl) \
+ NO_LIBPYTHON=$(puse python) \
+ NO_LIBUNWIND=$(puse unwind) \
+ NO_LIBZSTD=$(puse zstd) \
+ NO_SDT=$(puse systemtap) \
+ NO_SLANG=$(puse slang) \
+ NO_LZMA=$(puse lzma) \
+ NO_ZLIB=$(puse zlib) \
+ WERROR=0 \
+ LIBDIR="/usr/libexec/perf-core" \
+ libdir="${EPREFIX}/usr/$(get_libdir)" \
+ plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins" \
+ "$@"
+}
+
+src_compile() {
+ # test-clang.bin not build with g++
+ if use clang; then
+ make -C "${S_K}/tools/build/feature" V=1 CXX=${CHOST}-clang++ test-clang.bin || die
+ fi
+ perf_make -f Makefile.perf
+ use doc && perf_make -C Documentation man
+}
+
+src_test() {
+ :
+}
+
+src_install() {
+ _install_python_ext() {
+ perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
+ }
+
+ perf_make -f Makefile.perf install DESTDIR="${D}"
+
+ if use python; then
+ python_foreach_impl _install_python_ext
+ fi
+
+ if use gtk; then
+ local libdir
+ libdir="$(get_libdir)"
+ # on some arches it ends up in lib even on 64bit, ppc64 for instance.
+ [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
+ mv "${ED}"/usr/${libdir}/libperf-gtk.so \
+ "${ED}"/usr/libexec/perf-core || die
+ fi
+
+ dodoc CREDITS
+
+ dodoc *txt Documentation/*.txt
+
+ # perf needs this decompressed to print out tips for users
+ docompress -x /usr/share/doc/${PF}/tips.txt
+
+ if use doc ; then
+ doman Documentation/*.1
+ fi
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-06-13 11:41 Sam James
0 siblings, 0 replies; 141+ messages in thread
From: Sam James @ 2023-06-13 11:41 UTC (permalink / raw
To: gentoo-commits
commit: 48cca6c4e03a095cc99c744a689b0633baab1ce3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 13 11:40:17 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 13 11:40:17 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48cca6c4
dev-util/perf: depend on newer tar for 'gtar' symlink
Thanks to jkroon, flow, and ceamac.
Bug: https://bugs.gentoo.org/887761
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/perf/perf-5.19-r1.ebuild | 1 +
dev-util/perf/perf-6.0-r1.ebuild | 1 +
dev-util/perf/perf-6.2-r1.ebuild | 1 +
dev-util/perf/perf-6.3.ebuild | 1 +
4 files changed, 4 insertions(+)
diff --git a/dev-util/perf/perf-5.19-r1.ebuild b/dev-util/perf/perf-5.19-r1.ebuild
index ea6fd7e11d61..da0f5c7509fe 100644
--- a/dev-util/perf/perf-5.19-r1.ebuild
+++ b/dev-util/perf/perf-5.19-r1.ebuild
@@ -41,6 +41,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
BDEPEND="
${LINUX_PATCH+dev-util/patchutils}
${PYTHON_DEPS}
+ >=app-arch/tar-1.34-r2
dev-python/setuptools[${PYTHON_USEDEP}]
sys-devel/bison
sys-devel/flex
diff --git a/dev-util/perf/perf-6.0-r1.ebuild b/dev-util/perf/perf-6.0-r1.ebuild
index 04184b462006..c1abe01f17eb 100644
--- a/dev-util/perf/perf-6.0-r1.ebuild
+++ b/dev-util/perf/perf-6.0-r1.ebuild
@@ -40,6 +40,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
BDEPEND="
${LINUX_PATCH+dev-util/patchutils}
${PYTHON_DEPS}
+ >=app-arch/tar-1.34-r2
dev-python/setuptools[${PYTHON_USEDEP}]
sys-devel/bison
sys-devel/flex
diff --git a/dev-util/perf/perf-6.2-r1.ebuild b/dev-util/perf/perf-6.2-r1.ebuild
index 8a46cf67337d..8c07d2f59dcb 100644
--- a/dev-util/perf/perf-6.2-r1.ebuild
+++ b/dev-util/perf/perf-6.2-r1.ebuild
@@ -40,6 +40,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
BDEPEND="
${LINUX_PATCH+dev-util/patchutils}
${PYTHON_DEPS}
+ >=app-arch/tar-1.34-r2
dev-python/setuptools[${PYTHON_USEDEP}]
sys-devel/bison
sys-devel/flex
diff --git a/dev-util/perf/perf-6.3.ebuild b/dev-util/perf/perf-6.3.ebuild
index 8a46cf67337d..8c07d2f59dcb 100644
--- a/dev-util/perf/perf-6.3.ebuild
+++ b/dev-util/perf/perf-6.3.ebuild
@@ -40,6 +40,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
BDEPEND="
${LINUX_PATCH+dev-util/patchutils}
${PYTHON_DEPS}
+ >=app-arch/tar-1.34-r2
dev-python/setuptools[${PYTHON_USEDEP}]
sys-devel/bison
sys-devel/flex
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-06-24 3:22 Sam James
0 siblings, 0 replies; 141+ messages in thread
From: Sam James @ 2023-06-24 3:22 UTC (permalink / raw
To: gentoo-commits
commit: d40685c2a3b7538d636900cecf7d48d925b35f96
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 24 03:22:05 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 24 03:22:05 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d40685c2
dev-util/perf: Stabilize 6.3 arm, #909049
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/perf/perf-6.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-6.3.ebuild b/dev-util/perf/perf-6.3.ebuild
index 934134aceb49..e2a99143a13c 100644
--- a/dev-util/perf/perf-6.3.ebuild
+++ b/dev-util/perf/perf-6.3.ebuild
@@ -31,7 +31,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 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-06-24 3:22 Sam James
0 siblings, 0 replies; 141+ messages in thread
From: Sam James @ 2023-06-24 3:22 UTC (permalink / raw
To: gentoo-commits
commit: cbd32a6151f20f228041407b45438ea706fd9287
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 24 03:22:06 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 24 03:22:06 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbd32a61
dev-util/perf: Stabilize 6.3 arm64, #909049
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/perf/perf-6.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-6.3.ebuild b/dev-util/perf/perf-6.3.ebuild
index e2a99143a13c..58c17d81ea03 100644
--- a/dev-util/perf/perf-6.3.ebuild
+++ b/dev-util/perf/perf-6.3.ebuild
@@ -31,7 +31,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 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-06-24 3:22 Sam James
0 siblings, 0 replies; 141+ messages in thread
From: Sam James @ 2023-06-24 3:22 UTC (permalink / raw
To: gentoo-commits
commit: eccec34d834c595bfd123be95c4685d56394ff91
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 24 03:22:08 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 24 03:22:08 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eccec34d
dev-util/perf: Stabilize 6.3 ppc, #909049
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/perf/perf-6.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-6.3.ebuild b/dev-util/perf/perf-6.3.ebuild
index 58c17d81ea03..31bad3f7e7fe 100644
--- a/dev-util/perf/perf-6.3.ebuild
+++ b/dev-util/perf/perf-6.3.ebuild
@@ -31,7 +31,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 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-06-24 3:22 Sam James
0 siblings, 0 replies; 141+ messages in thread
From: Sam James @ 2023-06-24 3:22 UTC (permalink / raw
To: gentoo-commits
commit: a4fb2b60b7ae72cd1193c6d88fbe8b0e8c36ee9d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 24 03:22:01 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 24 03:22:01 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4fb2b60
dev-util/perf: Stabilize 6.3 x86, #909049
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/perf/perf-6.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-6.3.ebuild b/dev-util/perf/perf-6.3.ebuild
index 8c07d2f59dcb..2f9cc2fb8a28 100644
--- a/dev-util/perf/perf-6.3.ebuild
+++ b/dev-util/perf/perf-6.3.ebuild
@@ -31,7 +31,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 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-06-24 3:22 Sam James
0 siblings, 0 replies; 141+ messages in thread
From: Sam James @ 2023-06-24 3:22 UTC (permalink / raw
To: gentoo-commits
commit: 4a471ad5a1d2542d2e6ee7f31725030cc451bd15
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 24 03:22:04 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 24 03:22:04 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a471ad5
dev-util/perf: Stabilize 6.3 amd64, #909049
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/perf/perf-6.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-6.3.ebuild b/dev-util/perf/perf-6.3.ebuild
index 1106da74fe18..934134aceb49 100644
--- a/dev-util/perf/perf-6.3.ebuild
+++ b/dev-util/perf/perf-6.3.ebuild
@@ -31,7 +31,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 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-06-24 3:22 Sam James
0 siblings, 0 replies; 141+ messages in thread
From: Sam James @ 2023-06-24 3:22 UTC (permalink / raw
To: gentoo-commits
commit: ebd850e9a7275d091ab45d12ba92b2e3200f73f2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 24 03:22:03 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 24 03:22:03 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebd850e9
dev-util/perf: Stabilize 6.3 ppc64, #909049
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/perf/perf-6.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-6.3.ebuild b/dev-util/perf/perf-6.3.ebuild
index 2f9cc2fb8a28..1106da74fe18 100644
--- a/dev-util/perf/perf-6.3.ebuild
+++ b/dev-util/perf/perf-6.3.ebuild
@@ -31,7 +31,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 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-06-28 17:33 Matt Turner
0 siblings, 0 replies; 141+ messages in thread
From: Matt Turner @ 2023-06-28 17:33 UTC (permalink / raw
To: gentoo-commits
commit: 62d87035fc81ae784f0bee1b71dc584167c5f55a
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 02:43:29 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 17:33:08 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62d87035
dev-util/perf: Bump to EAPI=8, update PYTHON_COMPAT
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
dev-util/perf/perf-6.3-r1.ebuild | 269 +++++++++++++++++++++++++++++++++++++++
1 file changed, 269 insertions(+)
diff --git a/dev-util/perf/perf-6.3-r1.ebuild b/dev-util/perf/perf-6.3-r1.ebuild
new file mode 100644
index 000000000000..b18a69130d91
--- /dev/null
+++ b/dev-util/perf/perf-6.3-r1.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit bash-completion-r1 estack llvm toolchain-funcs python-r1 linux-info
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+ LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+ PATCH_VERSION=$(ver_cut 1-3)
+ LINUX_PATCH=patch-${PV//_/-}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+ https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ ${PV} == *.*.* ]] ; then
+ # stable-release series
+ LINUX_VER=$(ver_cut 1-2)
+ LINUX_PATCH=patch-${PV}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+ LINUX_VER=${PV}
+ SRC_URI=""
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+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 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# setuptools (and Python) are always needed even if not building Python bindings
+BDEPEND="
+ ${LINUX_PATCH+dev-util/patchutils}
+ ${PYTHON_DEPS}
+ >=app-arch/tar-1.34-r2
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+ doc? (
+ app-text/asciidoc
+ app-text/sgml-common
+ app-text/xmlto
+ sys-process/time
+ )
+"
+
+RDEPEND="audit? ( sys-process/audit )
+ babeltrace? ( dev-util/babeltrace )
+ crypt? ( virtual/libcrypt:= )
+ clang? (
+ sys-devel/clang:=
+ sys-devel/llvm:=
+ )
+ gtk? ( x11-libs/gtk+:2 )
+ java? ( virtual/jre:* )
+ libpfm? ( dev-libs/libpfm )
+ lzma? ( app-arch/xz-utils )
+ numa? ( sys-process/numactl )
+ perl? ( dev-lang/perl:= )
+ python? ( ${PYTHON_DEPS} )
+ slang? ( sys-libs/slang )
+ systemtap? ( dev-util/systemtap )
+ unwind? ( sys-libs/libunwind )
+ zlib? ( sys-libs/zlib )
+ zstd? ( app-arch/zstd )
+ dev-libs/elfutils
+ sys-libs/binutils-libs:="
+
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-5.10
+ java? ( virtual/jdk )
+"
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
+CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+
+QA_FLAGS_IGNORED=(
+ 'usr/bin/perf-read-vdso32' # not linked with anything except for libc
+ 'usr/libexec/perf-core/dlfilters/.*' # plugins
+)
+
+pkg_pretend() {
+ if ! use doc ; then
+ ewarn "Without the doc USE flag you won't get any documentation nor man pages."
+ ewarn "And without man pages, you won't get any --help output for perf and its"
+ ewarn "sub-tools."
+ fi
+}
+
+pkg_setup() {
+ use clang && llvm_pkg_setup
+ # We enable python unconditionally as libbpf always generates
+ # API headers using python script
+ python_setup
+}
+
+# src_unpack and src_prepare are copied to dev-util/bpftool since
+# it's building from the same tarball, please keep it in sync with bpftool
+src_unpack() {
+ local paths=(
+ tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
+ scripts include lib "arch/*/lib"
+ )
+
+ # We expect the tar implementation to support the -j option (both
+ # GNU tar and libarchive's tar support that).
+ echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+ gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+ "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ eshopts_push -o noglob
+ ebegin "Filtering partial source patch"
+ filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+ > ${P}.patch
+ eend $? || die "filterdiff failed"
+ eshopts_pop
+ fi
+
+ local a
+ for a in ${A}; do
+ [[ ${a} == ${LINUX_SOURCES} ]] && continue
+ [[ ${a} == ${LINUX_PATCH} ]] && continue
+ unpack ${a}
+ done
+}
+
+src_prepare() {
+ default
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ pushd "${S_K}" >/dev/null || die
+ eapply "${WORKDIR}"/${P}.patch
+ popd || die
+ fi
+
+ pushd "${S_K}" >/dev/null || die
+ eapply "${FILESDIR}"/perf-6.0-clang.patch
+ eapply "${FILESDIR}"/perf-6.0-c++17.patch
+ popd || die
+
+ # 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 \
+ "${S_K}"/tools/lib/perf/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' {} +
+}
+
+puse() { usex $1 "" no; }
+perf_make() {
+ # The arch parsing is a bit funky. The perf tools package is integrated
+ # into the kernel, so it wants an ARCH that looks like the kernel arch,
+ # but it also wants to know about the split value -- i386/x86_64 vs just
+ # x86. We can get that by telling the func to use an older linux version.
+ # It's kind of a hack, but not that bad ...
+
+ # LIBDIR sets a search path of perf-gtk.so. Bug 515954
+
+ local arch=$(tc-arch-kernel)
+ local java_dir
+ use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
+ # FIXME: NO_CORESIGHT
+ 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)" \
+ PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+ prefix="${EPREFIX}/usr" bindir_relative="bin" \
+ tipdir="share/doc/${PF}" \
+ EXTRA_CFLAGS="${CFLAGS}" \
+ EXTRA_LDFLAGS="${LDFLAGS}" \
+ ARCH="${arch}" \
+ JDIR="${java_dir}" \
+ LIBCLANGLLVM=$(usex clang 1 "") \
+ LIBPFM4=$(usex libpfm 1 "") \
+ NO_AUXTRACE="" \
+ NO_BACKTRACE="" \
+ NO_CORESIGHT=1 \
+ NO_DEMANGLE= \
+ GTK2=$(usex gtk 1 "") \
+ feature-gtk2-infobar=$(usex gtk 1 "") \
+ NO_JVMTI=$(puse java) \
+ NO_LIBAUDIT=$(puse audit) \
+ NO_LIBBABELTRACE=$(puse babeltrace) \
+ NO_LIBBIONIC=1 \
+ NO_LIBBPF= \
+ NO_LIBCRYPTO=$(puse crypt) \
+ NO_LIBDW_DWARF_UNWIND= \
+ NO_LIBELF= \
+ NO_LIBNUMA=$(puse numa) \
+ NO_LIBPERL=$(puse perl) \
+ NO_LIBPYTHON=$(puse python) \
+ NO_LIBUNWIND=$(puse unwind) \
+ NO_LIBZSTD=$(puse zstd) \
+ NO_SDT=$(puse systemtap) \
+ NO_SLANG=$(puse slang) \
+ NO_LZMA=$(puse lzma) \
+ NO_ZLIB=$(puse zlib) \
+ WERROR=0 \
+ LIBDIR="/usr/libexec/perf-core" \
+ libdir="${EPREFIX}/usr/$(get_libdir)" \
+ plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins" \
+ "$@"
+}
+
+src_compile() {
+ # test-clang.bin not build with g++
+ if use clang; then
+ make -C "${S_K}/tools/build/feature" V=1 CXX=${CHOST}-clang++ test-clang.bin || die
+ fi
+ perf_make -f Makefile.perf
+ use doc && perf_make -C Documentation man
+}
+
+src_test() {
+ :
+}
+
+src_install() {
+ _install_python_ext() {
+ perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
+ }
+
+ perf_make -f Makefile.perf install DESTDIR="${D}"
+
+ if use python; then
+ python_foreach_impl _install_python_ext
+ fi
+
+ if use gtk; then
+ local libdir
+ libdir="$(get_libdir)"
+ # on some arches it ends up in lib even on 64bit, ppc64 for instance.
+ [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
+ mv "${ED}"/usr/${libdir}/libperf-gtk.so \
+ "${ED}"/usr/libexec/perf-core || die
+ fi
+
+ dodoc CREDITS
+
+ dodoc *txt Documentation/*.txt
+
+ # perf needs this decompressed to print out tips for users
+ docompress -x /usr/share/doc/${PF}/tips.txt
+
+ if use doc ; then
+ doman Documentation/*.1
+ fi
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-06-28 17:33 Matt Turner
0 siblings, 0 replies; 141+ messages in thread
From: Matt Turner @ 2023-06-28 17:33 UTC (permalink / raw
To: gentoo-commits
commit: 142923c48d4660bae5515ae9eeed727426d454ae
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 02:40:16 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 17:33:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=142923c4
dev-util/perf: Use bash array for emake arguments
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
dev-util/perf/perf-6.3-r1.ebuild | 81 +++++++++++++++++++++-------------------
1 file changed, 42 insertions(+), 39 deletions(-)
diff --git a/dev-util/perf/perf-6.3-r1.ebuild b/dev-util/perf/perf-6.3-r1.ebuild
index b18a69130d91..86872cee5e40 100644
--- a/dev-util/perf/perf-6.3-r1.ebuild
+++ b/dev-util/perf/perf-6.3-r1.ebuild
@@ -181,46 +181,49 @@ perf_make() {
local java_dir
use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
# FIXME: NO_CORESIGHT
- 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)" \
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \
- prefix="${EPREFIX}/usr" bindir_relative="bin" \
- tipdir="share/doc/${PF}" \
- EXTRA_CFLAGS="${CFLAGS}" \
- EXTRA_LDFLAGS="${LDFLAGS}" \
- ARCH="${arch}" \
- JDIR="${java_dir}" \
- LIBCLANGLLVM=$(usex clang 1 "") \
- LIBPFM4=$(usex libpfm 1 "") \
- NO_AUXTRACE="" \
- NO_BACKTRACE="" \
- NO_CORESIGHT=1 \
- NO_DEMANGLE= \
- GTK2=$(usex gtk 1 "") \
- feature-gtk2-infobar=$(usex gtk 1 "") \
- NO_JVMTI=$(puse java) \
- NO_LIBAUDIT=$(puse audit) \
- NO_LIBBABELTRACE=$(puse babeltrace) \
- NO_LIBBIONIC=1 \
- NO_LIBBPF= \
- NO_LIBCRYPTO=$(puse crypt) \
- NO_LIBDW_DWARF_UNWIND= \
- NO_LIBELF= \
- NO_LIBNUMA=$(puse numa) \
- NO_LIBPERL=$(puse perl) \
- NO_LIBPYTHON=$(puse python) \
- NO_LIBUNWIND=$(puse unwind) \
- NO_LIBZSTD=$(puse zstd) \
- NO_SDT=$(puse systemtap) \
- NO_SLANG=$(puse slang) \
- NO_LZMA=$(puse lzma) \
- NO_ZLIB=$(puse zlib) \
- WERROR=0 \
- LIBDIR="/usr/libexec/perf-core" \
- libdir="${EPREFIX}/usr/$(get_libdir)" \
- plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins" \
+ local emakeargs=(
+ 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)"
+ PKG_CONFIG="$(tc-getPKG_CONFIG)"
+ prefix="${EPREFIX}/usr" bindir_relative="bin"
+ tipdir="share/doc/${PF}"
+ EXTRA_CFLAGS="${CFLAGS}"
+ EXTRA_LDFLAGS="${LDFLAGS}"
+ ARCH="${arch}"
+ JDIR="${java_dir}"
+ LIBCLANGLLVM=$(usex clang 1 "")
+ LIBPFM4=$(usex libpfm 1 "")
+ NO_AUXTRACE=""
+ NO_BACKTRACE=""
+ NO_CORESIGHT=1
+ NO_DEMANGLE=
+ GTK2=$(usex gtk 1 "")
+ feature-gtk2-infobar=$(usex gtk 1 "")
+ NO_JVMTI=$(puse java)
+ NO_LIBAUDIT=$(puse audit)
+ NO_LIBBABELTRACE=$(puse babeltrace)
+ NO_LIBBIONIC=1
+ NO_LIBBPF=
+ NO_LIBCRYPTO=$(puse crypt)
+ NO_LIBDW_DWARF_UNWIND=
+ NO_LIBELF=
+ NO_LIBNUMA=$(puse numa)
+ NO_LIBPERL=$(puse perl)
+ NO_LIBPYTHON=$(puse python)
+ NO_LIBUNWIND=$(puse unwind)
+ NO_LIBZSTD=$(puse zstd)
+ NO_SDT=$(puse systemtap)
+ NO_SLANG=$(puse slang)
+ NO_LZMA=$(puse lzma)
+ NO_ZLIB=$(puse zlib)
+ WERROR=0
+ LIBDIR="/usr/libexec/perf-core"
+ libdir="${EPREFIX}/usr/$(get_libdir)"
+ plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins"
"$@"
+ )
+ emake "${emakeargs[@]}"
}
src_compile() {
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-06-28 17:33 Matt Turner
0 siblings, 0 replies; 141+ messages in thread
From: Matt Turner @ 2023-06-28 17:33 UTC (permalink / raw
To: gentoo-commits
commit: e56508f3b5ca997875ab81ace43b72f8d2983958
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 02:52:04 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 17:33:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e56508f3
dev-util/perf: Fix dependency for USE=crypt
perf links with libcrypto.so (from dev-libs/openssl), not libcrypt.so
(from virtual/libcrypt).
Closes: https://bugs.gentoo.org/909167
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
dev-util/perf/perf-6.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-6.3-r1.ebuild b/dev-util/perf/perf-6.3-r1.ebuild
index 5f4f5f9688c7..2aac8aa2ed75 100644
--- a/dev-util/perf/perf-6.3-r1.ebuild
+++ b/dev-util/perf/perf-6.3-r1.ebuild
@@ -61,7 +61,7 @@ RDEPEND="
sys-devel/clang:=
sys-devel/llvm:=
)
- crypt? ( virtual/libcrypt:= )
+ crypt? ( dev-libs/openssl:= )
gtk? ( x11-libs/gtk+:2 )
java? ( virtual/jre:* )
libpfm? ( dev-libs/libpfm:= )
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-06-28 17:33 Matt Turner
0 siblings, 0 replies; 141+ messages in thread
From: Matt Turner @ 2023-06-28 17:33 UTC (permalink / raw
To: gentoo-commits
commit: 343324ce00bb07df8ce4e1a567e47bea6a7ffd2c
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 02:48:25 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 17:33:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=343324ce
dev-util/perf: Add IUSE=caps
Fixes an automatic dependency on sys-libs/libcap.
Bug: https://bugs.gentoo.org/909167
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
dev-util/perf/perf-6.3-r1.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-6.3-r1.ebuild b/dev-util/perf/perf-6.3-r1.ebuild
index b40e0ec1fdcc..5f4f5f9688c7 100644
--- a/dev-util/perf/perf-6.3-r1.ebuild
+++ b/dev-util/perf/perf-6.3-r1.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 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
+IUSE="audit babeltrace caps clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -56,6 +56,7 @@ BDEPEND="
RDEPEND="
audit? ( sys-process/audit )
babeltrace? ( dev-util/babeltrace )
+ caps? ( sys-libs/libcap )
clang? (
sys-devel/clang:=
sys-devel/llvm:=
@@ -207,6 +208,7 @@ perf_make() {
NO_LIBBABELTRACE=$(puse babeltrace)
NO_LIBBIONIC=1
NO_LIBBPF=
+ NO_LIBCAP=$(puse caps)
NO_LIBCRYPTO=$(puse crypt)
NO_LIBDW_DWARF_UNWIND=
NO_LIBELF=
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-06-28 17:33 Matt Turner
0 siblings, 0 replies; 141+ messages in thread
From: Matt Turner @ 2023-06-28 17:33 UTC (permalink / raw
To: gentoo-commits
commit: bc44f71acb305cd72377cc0fda48498a6abde848
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 03:01:00 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 17:33:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc44f71a
dev-util/perf: Remove IUSE=zlib and always enable support
libbpf support is built unconditionally, and it requires zlib. zlib is
on every system anyway, so remove the USE flag.
Closes: https://bugs.gentoo.org/839003
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
dev-util/perf/perf-6.3-r1.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-util/perf/perf-6.3-r1.ebuild b/dev-util/perf/perf-6.3-r1.ebuild
index 2aac8aa2ed75..eb28c4419c9b 100644
--- a/dev-util/perf/perf-6.3-r1.ebuild
+++ b/dev-util/perf/perf-6.3-r1.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 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit babeltrace caps clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
+IUSE="audit babeltrace caps clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zstd"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -72,10 +72,10 @@ RDEPEND="
slang? ( sys-libs/slang )
systemtap? ( dev-util/systemtap )
unwind? ( sys-libs/libunwind:= )
- zlib? ( sys-libs/zlib )
zstd? ( app-arch/zstd:= )
dev-libs/elfutils
sys-libs/binutils-libs:=
+ sys-libs/zlib
"
DEPEND="${RDEPEND}
@@ -220,7 +220,7 @@ perf_make() {
NO_SDT=$(puse systemtap)
NO_SLANG=$(puse slang)
NO_LZMA=$(puse lzma)
- NO_ZLIB=$(puse zlib)
+ NO_ZLIB=
WERROR=0
LIBDIR="/usr/libexec/perf-core"
libdir="${EPREFIX}/usr/$(get_libdir)"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-06-28 17:33 Matt Turner
0 siblings, 0 replies; 141+ messages in thread
From: Matt Turner @ 2023-06-28 17:33 UTC (permalink / raw
To: gentoo-commits
commit: b66e90e21930128e314e975fe42e39d570224480
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 03:34:44 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 17:33:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b66e90e2
dev-util/perf: Subscribe to subslot of dev-libs/libpfm
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
dev-util/perf/perf-6.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-6.3-r1.ebuild b/dev-util/perf/perf-6.3-r1.ebuild
index 2e0460ebb4e8..76a11d855ebd 100644
--- a/dev-util/perf/perf-6.3-r1.ebuild
+++ b/dev-util/perf/perf-6.3-r1.ebuild
@@ -63,7 +63,7 @@ RDEPEND="
crypt? ( virtual/libcrypt:= )
gtk? ( x11-libs/gtk+:2 )
java? ( virtual/jre:* )
- libpfm? ( dev-libs/libpfm )
+ libpfm? ( dev-libs/libpfm:= )
lzma? ( app-arch/xz-utils )
numa? ( sys-process/numactl )
perl? ( dev-lang/perl:= )
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-06-28 17:33 Matt Turner
0 siblings, 0 replies; 141+ messages in thread
From: Matt Turner @ 2023-06-28 17:33 UTC (permalink / raw
To: gentoo-commits
commit: 6ddce39ddcc806fc9f16c146c66ac84aeb9f07cf
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 03:35:36 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 17:33:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ddce39d
dev-util/perf: Subscribe to subslot of sys-libs/libunwind
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
dev-util/perf/perf-6.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-6.3-r1.ebuild b/dev-util/perf/perf-6.3-r1.ebuild
index 76a11d855ebd..b40e0ec1fdcc 100644
--- a/dev-util/perf/perf-6.3-r1.ebuild
+++ b/dev-util/perf/perf-6.3-r1.ebuild
@@ -70,7 +70,7 @@ RDEPEND="
python? ( ${PYTHON_DEPS} )
slang? ( sys-libs/slang )
systemtap? ( dev-util/systemtap )
- unwind? ( sys-libs/libunwind )
+ unwind? ( sys-libs/libunwind:= )
zlib? ( sys-libs/zlib )
zstd? ( app-arch/zstd:= )
dev-libs/elfutils
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-06-28 17:33 Matt Turner
0 siblings, 0 replies; 141+ messages in thread
From: Matt Turner @ 2023-06-28 17:33 UTC (permalink / raw
To: gentoo-commits
commit: a9ab53f6998addb211fb7140f76078e6343d43f8
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 02:52:38 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 17:33:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9ab53f6
dev-util/perf: Subscribe to subslot of app-arch/zstd
Bug: https://bugs.gentoo.org/909167
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
dev-util/perf/perf-6.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-6.3-r1.ebuild b/dev-util/perf/perf-6.3-r1.ebuild
index f0bb18a0173b..2e0460ebb4e8 100644
--- a/dev-util/perf/perf-6.3-r1.ebuild
+++ b/dev-util/perf/perf-6.3-r1.ebuild
@@ -72,7 +72,7 @@ RDEPEND="
systemtap? ( dev-util/systemtap )
unwind? ( sys-libs/libunwind )
zlib? ( sys-libs/zlib )
- zstd? ( app-arch/zstd )
+ zstd? ( app-arch/zstd:= )
dev-libs/elfutils
sys-libs/binutils-libs:=
"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-06-28 17:33 Matt Turner
0 siblings, 0 replies; 141+ messages in thread
From: Matt Turner @ 2023-06-28 17:33 UTC (permalink / raw
To: gentoo-commits
commit: 19ea10be450eac1c3c5af732b275b286e111cb7d
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 02:46:00 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 17:33:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19ea10be
dev-util/perf: Reformat RDEPEND
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
dev-util/perf/perf-6.3-r1.ebuild | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/dev-util/perf/perf-6.3-r1.ebuild b/dev-util/perf/perf-6.3-r1.ebuild
index 86872cee5e40..f0bb18a0173b 100644
--- a/dev-util/perf/perf-6.3-r1.ebuild
+++ b/dev-util/perf/perf-6.3-r1.ebuild
@@ -53,13 +53,14 @@ BDEPEND="
)
"
-RDEPEND="audit? ( sys-process/audit )
+RDEPEND="
+ audit? ( sys-process/audit )
babeltrace? ( dev-util/babeltrace )
- crypt? ( virtual/libcrypt:= )
clang? (
sys-devel/clang:=
sys-devel/llvm:=
)
+ crypt? ( virtual/libcrypt:= )
gtk? ( x11-libs/gtk+:2 )
java? ( virtual/jre:* )
libpfm? ( dev-libs/libpfm )
@@ -73,7 +74,8 @@ RDEPEND="audit? ( sys-process/audit )
zlib? ( sys-libs/zlib )
zstd? ( app-arch/zstd )
dev-libs/elfutils
- sys-libs/binutils-libs:="
+ sys-libs/binutils-libs:=
+"
DEPEND="${RDEPEND}
>=sys-kernel/linux-headers-5.10
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-07-06 15:49 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2023-07-06 15:49 UTC (permalink / raw
To: gentoo-commits
commit: e9665af1138d666e33b2be0ddb73d1e460016d3b
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 6 15:42:50 2023 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Thu Jul 6 15:49:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9665af1
dev-util/perf: build fixes for USE=-libtraceevent and USE=-tcmalloc
Most NO_FOO tests use "ifndef NO_FOO", but NO_LIBTRACEEVENT in particular
uses "ifneq ($(NO_LIBTRACEEVENT),1)", so puse didn't work for it. Same
for TCMALLOC, the test is ifneq "($(TCMALLOC),)" so a plain usex fails
to disable it as it sets TCMALLOC=no.
Closes: https://bugs.gentoo.org/909770
Closes: https://bugs.gentoo.org/909763
Closes: https://bugs.gentoo.org/909764
Closes: https://bugs.gentoo.org/909756
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/{perf-6.4.ebuild => perf-6.4-r1.ebuild} | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/dev-util/perf/perf-6.4.ebuild b/dev-util/perf/perf-6.4-r1.ebuild
similarity index 97%
rename from dev-util/perf/perf-6.4.ebuild
rename to dev-util/perf/perf-6.4-r1.ebuild
index 2ef01e9f9d7b..83118f390754 100644
--- a/dev-util/perf/perf-6.4.ebuild
+++ b/dev-util/perf/perf-6.4-r1.ebuild
@@ -34,7 +34,10 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE="audit babeltrace bpf caps clang crypt debug +doc gtk java libpfm libtraceevent libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="
+ bpf? ( clang )
+ ${PYTHON_REQUIRED_USE}
+"
# setuptools (and Python) are always needed even if not building Python bindings
BDEPEND="
@@ -197,7 +200,7 @@ src_prepare() {
find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
}
-puse() { usex $1 "" no; }
+puse() { usex $1 "" 1; }
perf_make() {
# The arch parsing is a bit funky. The perf tools package is integrated
# into the kernel, so it wants an ARCH that looks like the kernel arch,
@@ -224,14 +227,13 @@ perf_make() {
BUILD_BPF_SKEL=$(usex bpf 1 "") \
BUILD_NONDISTRO=1
JDIR="${java_dir}"
- LIBCLANGLLVM=$(usex clang 1 "")
- LIBPFM4=$(usex libpfm 1 "")
- NO_AUXTRACE=""
- NO_BACKTRACE=""
CORESIGHT=
- NO_DEMANGLE=
GTK2=$(usex gtk 1 "")
+ LIBCLANGLLVM=$(usex clang 1 "")
feature-gtk2-infobar=$(usex gtk 1 "")
+ NO_AUXTRACE=
+ NO_BACKTRACE=
+ NO_DEMANGLE=
NO_JEVENTS=$(puse python)
NO_JVMTI=$(puse java)
NO_LIBAUDIT=$(puse audit)
@@ -244,6 +246,7 @@ perf_make() {
NO_LIBELF=
NO_LIBNUMA=$(puse numa)
NO_LIBPERL=$(puse perl)
+ NO_LIBPFM4=$(puse libpfm)
NO_LIBPYTHON=$(puse python)
NO_LIBTRACEEVENT=$(puse libtraceevent)
NO_LIBUNWIND=$(puse unwind)
@@ -252,7 +255,7 @@ perf_make() {
NO_SLANG=$(puse slang)
NO_LZMA=$(puse lzma)
NO_ZLIB=
- TCMALLOC=$(usex tcmalloc)
+ TCMALLOC=$(usex tcmalloc 1 "")
WERROR=0
LIBDIR="/usr/libexec/perf-core"
libdir="${EPREFIX}/usr/$(get_libdir)"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-07-06 16:12 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2023-07-06 16:12 UTC (permalink / raw
To: gentoo-commits
commit: 2d4cde40f1a526197f843cd522cc80ae992bacd1
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 6 15:58:25 2023 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Thu Jul 6 16:11:59 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d4cde40
dev-util/perf: move myself up in maintainers to get assigned perf bugs
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/metadata.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-util/perf/metadata.xml b/dev-util/perf/metadata.xml
index 44f52d4869a8..b249668f8c69 100644
--- a/dev-util/perf/metadata.xml
+++ b/dev-util/perf/metadata.xml
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="person">
+ <email>amadio@gentoo.org</email>
+ <name>Guilherme Amadio</name>
+ </maintainer>
<maintainer type="person">
<email>naota@gentoo.org</email>
<name>Naohiro Aota</name>
@@ -9,10 +13,6 @@
<email>dlan@gentoo.org</email>
<name>Yixun Lan</name>
</maintainer>
- <maintainer type="person">
- <email>amadio@gentoo.org</email>
- <name>Guilherme Amadio</name>
- </maintainer>
<use>
<flag name="bpf">Enable support for eBPF features with <pkg>dev-libs/libbpf</pkg></flag>
<flag name="babeltrace">Enable <pkg>dev-util/babeltrace</pkg> support</flag>
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-07-10 15:34 Matt Turner
0 siblings, 0 replies; 141+ messages in thread
From: Matt Turner @ 2023-07-10 15:34 UTC (permalink / raw
To: gentoo-commits
commit: 6020fc656e53f467c2d548a6550f835e07780b1f
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 10 15:33:40 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Jul 10 15:34:03 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6020fc65
dev-util/perf: Filter LTO flags
Bug: https://bugs.gentoo.org/858449
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
dev-util/perf/perf-6.3-r1.ebuild | 4 +++-
dev-util/perf/perf-6.3.ebuild | 4 +++-
dev-util/perf/perf-6.4-r1.ebuild | 4 +++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/dev-util/perf/perf-6.3-r1.ebuild b/dev-util/perf/perf-6.3-r1.ebuild
index eb28c4419c9b..d519238f14e1 100644
--- a/dev-util/perf/perf-6.3-r1.ebuild
+++ b/dev-util/perf/perf-6.3-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
-inherit bash-completion-r1 estack llvm toolchain-funcs python-r1 linux-info
+inherit bash-completion-r1 estack flag-o-matic llvm toolchain-funcs python-r1 linux-info
DESCRIPTION="Userland tools for Linux Performance Counters"
HOMEPAGE="https://perf.wiki.kernel.org/"
@@ -231,6 +231,8 @@ perf_make() {
}
src_compile() {
+ filter-lto
+
# test-clang.bin not build with g++
if use clang; then
make -C "${S_K}/tools/build/feature" V=1 CXX=${CHOST}-clang++ test-clang.bin || die
diff --git a/dev-util/perf/perf-6.3.ebuild b/dev-util/perf/perf-6.3.ebuild
index 31bad3f7e7fe..8f0ac9a76ce4 100644
--- a/dev-util/perf/perf-6.3.ebuild
+++ b/dev-util/perf/perf-6.3.ebuild
@@ -4,7 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{9..11} )
-inherit bash-completion-r1 estack llvm toolchain-funcs python-r1 linux-info
+inherit bash-completion-r1 estack flag-o-matic llvm toolchain-funcs python-r1 linux-info
DESCRIPTION="Userland tools for Linux Performance Counters"
HOMEPAGE="https://perf.wiki.kernel.org/"
@@ -224,6 +224,8 @@ perf_make() {
}
src_compile() {
+ filter-lto
+
# test-clang.bin not build with g++
if use clang; then
make -C "${S_K}/tools/build/feature" V=1 CXX=${CHOST}-clang++ test-clang.bin || die
diff --git a/dev-util/perf/perf-6.4-r1.ebuild b/dev-util/perf/perf-6.4-r1.ebuild
index 83118f390754..c341b8367f60 100644
--- a/dev-util/perf/perf-6.4-r1.ebuild
+++ b/dev-util/perf/perf-6.4-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
-inherit bash-completion-r1 estack linux-info llvm toolchain-funcs python-r1
+inherit bash-completion-r1 estack flag-o-matic linux-info llvm toolchain-funcs python-r1
DESCRIPTION="Userland tools for Linux Performance Counters"
HOMEPAGE="https://perf.wiki.kernel.org/"
@@ -266,6 +266,8 @@ perf_make() {
}
src_compile() {
+ filter-lto
+
# test-clang.bin not build with g++
if use clang; then
make -C "${S_K}/tools/build/feature" V=1 CXX=${CHOST}-clang++ test-clang.bin || die
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-07-11 11:03 WANG Xuerui
0 siblings, 0 replies; 141+ messages in thread
From: WANG Xuerui @ 2023-07-11 11:03 UTC (permalink / raw
To: gentoo-commits
commit: 98b40b79e6b84457b9b747e289a1a7dad2a00e9e
Author: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 11 10:02:46 2023 +0000
Commit: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Tue Jul 11 11:02:02 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98b40b79
dev-util/perf: keyword 6.4-r1 for ~loong
Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>
dev-util/perf/perf-6.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-6.4-r1.ebuild b/dev-util/perf/perf-6.4-r1.ebuild
index c341b8367f60..a1a140af0ed7 100644
--- a/dev-util/perf/perf-6.4-r1.ebuild
+++ b/dev-util/perf/perf-6.4-r1.ebuild
@@ -31,7 +31,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 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE="audit babeltrace bpf caps clang crypt debug +doc gtk java libpfm libtraceevent libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
REQUIRED_USE="
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-09-12 19:22 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2023-09-12 19:22 UTC (permalink / raw
To: gentoo-commits
commit: 090f74fc7bb334a602d39db5e2fccd5937e3194b
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 12 19:21:30 2023 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Tue Sep 12 19:22:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=090f74fc
dev-util/perf: version bump to 6.5
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/Manifest | 1 +
dev-util/perf/perf-6.5.ebuild | 313 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 314 insertions(+)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index a8c77095f0ca..f24a9347ce54 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,2 +1,3 @@
DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
DIST linux-6.4.tar.xz 137794856 BLAKE2B b59eb04a8715af9f686978812e6d4a466172bb859f80657076de14cd0828b4fac15b688ff8959f5c65485f7f6bef26590412c66821e720de843cb8666f226c90 SHA512 11a48b25e0b513782d3b89101c2ec8dd9cefd6ce08dc63a91137903b66392aa72ca1fe32816710673af84dd47de3ab8738056a6af93dc0d5e60ef4b869b49928
+DIST linux-6.5.tar.xz 138898084 BLAKE2B 2e641b79a080e8f4ce283bcf6b74e2c6f15a374367f1c4c875c663868dbe801317340824fb3adb46b3a51d3b7e1f67cc4e8144d367621ec43ffba5c4eb8abb39 SHA512 1b59dc5e65d4922c3217a8c8f19022dfd6595ae89747861d825bfeb51a4ae6c85449d05db69635a712bef7b355b80318195665582d8933b1fed6ba582f6ff257
diff --git a/dev-util/perf/perf-6.5.ebuild b/dev-util/perf/perf-6.5.ebuild
new file mode 100644
index 000000000000..a1a140af0ed7
--- /dev/null
+++ b/dev-util/perf/perf-6.5.ebuild
@@ -0,0 +1,313 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit bash-completion-r1 estack flag-o-matic linux-info llvm toolchain-funcs python-r1
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+ LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+ PATCH_VERSION=$(ver_cut 1-3)
+ LINUX_PATCH=patch-${PV//_/-}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+ https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ ${PV} == *.*.* ]] ; then
+ # stable-release series
+ LINUX_VER=$(ver_cut 1-2)
+ LINUX_PATCH=patch-${PV}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+ LINUX_VER=${PV}
+ SRC_URI=""
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit babeltrace bpf caps clang crypt debug +doc gtk java libpfm libtraceevent libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
+
+REQUIRED_USE="
+ bpf? ( clang )
+ ${PYTHON_REQUIRED_USE}
+"
+
+# setuptools (and Python) are always needed even if not building Python bindings
+BDEPEND="
+ ${LINUX_PATCH+dev-util/patchutils}
+ ${PYTHON_DEPS}
+ >=app-arch/tar-1.34-r2
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+ doc? (
+ app-text/asciidoc
+ app-text/sgml-common
+ app-text/xmlto
+ sys-process/time
+ )
+"
+
+RDEPEND="
+ audit? ( sys-process/audit )
+ babeltrace? ( dev-util/babeltrace )
+ bpf? (
+ dev-libs/libbpf
+ dev-util/bpftool
+ dev-util/pahole
+ )
+ caps? ( sys-libs/libcap )
+ clang? (
+ sys-devel/clang:=
+ sys-devel/llvm:=
+ )
+ crypt? ( dev-libs/openssl:= )
+ gtk? ( x11-libs/gtk+:2 )
+ java? ( virtual/jre:* )
+ libpfm? ( dev-libs/libpfm:= )
+ libtraceevent? ( dev-libs/libtraceevent )
+ libtracefs? ( dev-libs/libtracefs )
+ lzma? ( app-arch/xz-utils )
+ numa? ( sys-process/numactl )
+ perl? ( dev-lang/perl:= )
+ python? ( ${PYTHON_DEPS} )
+ slang? ( sys-libs/slang )
+ systemtap? ( dev-util/systemtap )
+ tcmalloc? ( dev-util/google-perftools )
+ unwind? ( sys-libs/libunwind:= )
+ zstd? ( app-arch/zstd:= )
+ dev-libs/elfutils
+ sys-libs/binutils-libs:=
+ sys-libs/zlib
+"
+
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-5.10
+ java? ( virtual/jdk )
+"
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
+CONFIG_CHECK="
+ ~DEBUG_INFO
+ ~FTRACE
+ ~FTRACE_SYSCALLS
+ ~FUNCTION_TRACER
+ ~KALLSYMS
+ ~KALLSYMS_ALL
+ ~KPROBES
+ ~KPROBE_EVENTS
+ ~PERF_EVENTS
+ ~UPROBES
+ ~UPROBE_EVENTS
+"
+
+QA_FLAGS_IGNORED=(
+ 'usr/bin/perf-read-vdso32' # not linked with anything except for libc
+ 'usr/libexec/perf-core/dlfilters/.*' # plugins
+)
+
+pkg_pretend() {
+ if ! use doc ; then
+ ewarn "Without the doc USE flag you won't get any documentation nor man pages."
+ ewarn "And without man pages, you won't get any --help output for perf and its"
+ ewarn "sub-tools."
+ fi
+}
+
+pkg_setup() {
+ use clang && llvm_pkg_setup
+ # We enable python unconditionally as libbpf always generates
+ # API headers using python script
+ python_setup
+
+ if use bpf ; then
+ CONFIG_CHECK+="~BPF ~BPF_EVENTS ~BPF_SYSCALL ~DEBUG_INFO_BTF ~HAVE_EBPF_JIT"
+ fi
+
+ linux-info_pkg_setup
+}
+
+# src_unpack and src_prepare are copied to dev-util/bpftool since
+# it's building from the same tarball, please keep it in sync with bpftool
+src_unpack() {
+ local paths=(
+ kernel/bpf tools/{arch,bpf,build,include,lib,perf,scripts}
+ scripts include lib "arch/*/lib"
+ )
+
+ # We expect the tar implementation to support the -j option (both
+ # GNU tar and libarchive's tar support that).
+ echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+ gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+ "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ eshopts_push -o noglob
+ ebegin "Filtering partial source patch"
+ filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+ > ${P}.patch
+ eend $? || die "filterdiff failed"
+ eshopts_pop
+ fi
+
+ local a
+ for a in ${A}; do
+ [[ ${a} == ${LINUX_SOURCES} ]] && continue
+ [[ ${a} == ${LINUX_PATCH} ]] && continue
+ unpack ${a}
+ done
+}
+
+src_prepare() {
+ default
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ pushd "${S_K}" >/dev/null || die
+ eapply "${WORKDIR}"/${P}.patch
+ popd || die
+ fi
+
+ pushd "${S_K}" >/dev/null || die
+ eapply "${FILESDIR}"/perf-6.0-clang.patch
+ eapply "${FILESDIR}"/perf-6.0-c++17.patch
+ eapply "${FILESDIR}"/perf-6.4-libtracefs.patch
+ popd || die
+
+ # 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 \
+ "${S_K}"/tools/lib/perf/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' {} +
+}
+
+puse() { usex $1 "" 1; }
+perf_make() {
+ # The arch parsing is a bit funky. The perf tools package is integrated
+ # into the kernel, so it wants an ARCH that looks like the kernel arch,
+ # but it also wants to know about the split value -- i386/x86_64 vs just
+ # x86. We can get that by telling the func to use an older linux version.
+ # It's kind of a hack, but not that bad ...
+
+ # LIBDIR sets a search path of perf-gtk.so. Bug 515954
+
+ local arch=$(tc-arch-kernel)
+ local java_dir
+ use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
+ # FIXME: NO_CORESIGHT
+ local emakeargs=(
+ 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)"
+ PKG_CONFIG="$(tc-getPKG_CONFIG)"
+ prefix="${EPREFIX}/usr" bindir_relative="bin"
+ tipdir="share/doc/${PF}"
+ EXTRA_CFLAGS="${CFLAGS}"
+ EXTRA_LDFLAGS="${LDFLAGS}"
+ ARCH="${arch}"
+ BUILD_BPF_SKEL=$(usex bpf 1 "") \
+ BUILD_NONDISTRO=1
+ JDIR="${java_dir}"
+ CORESIGHT=
+ GTK2=$(usex gtk 1 "")
+ LIBCLANGLLVM=$(usex clang 1 "")
+ feature-gtk2-infobar=$(usex gtk 1 "")
+ NO_AUXTRACE=
+ NO_BACKTRACE=
+ NO_DEMANGLE=
+ NO_JEVENTS=$(puse python)
+ NO_JVMTI=$(puse java)
+ NO_LIBAUDIT=$(puse audit)
+ NO_LIBBABELTRACE=$(puse babeltrace)
+ NO_LIBBIONIC=1
+ NO_LIBBPF=$(puse bpf)
+ NO_LIBCAP=$(puse caps)
+ NO_LIBCRYPTO=$(puse crypt)
+ NO_LIBDW_DWARF_UNWIND=
+ NO_LIBELF=
+ NO_LIBNUMA=$(puse numa)
+ NO_LIBPERL=$(puse perl)
+ NO_LIBPFM4=$(puse libpfm)
+ NO_LIBPYTHON=$(puse python)
+ NO_LIBTRACEEVENT=$(puse libtraceevent)
+ NO_LIBUNWIND=$(puse unwind)
+ NO_LIBZSTD=$(puse zstd)
+ NO_SDT=$(puse systemtap)
+ NO_SLANG=$(puse slang)
+ NO_LZMA=$(puse lzma)
+ NO_ZLIB=
+ TCMALLOC=$(usex tcmalloc 1 "")
+ WERROR=0
+ LIBDIR="/usr/libexec/perf-core"
+ libdir="${EPREFIX}/usr/$(get_libdir)"
+ plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins"
+ "$@"
+ )
+ emake "${emakeargs[@]}"
+}
+
+src_compile() {
+ filter-lto
+
+ # test-clang.bin not build with g++
+ if use clang; then
+ make -C "${S_K}/tools/build/feature" V=1 CXX=${CHOST}-clang++ test-clang.bin || die
+ fi
+ perf_make -f Makefile.perf
+ use doc && perf_make -C Documentation man
+}
+
+src_test() {
+ :
+}
+
+src_install() {
+ _install_python_ext() {
+ perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
+ }
+
+ perf_make -f Makefile.perf install DESTDIR="${D}"
+
+ if use python; then
+ python_foreach_impl _install_python_ext
+ fi
+
+ if use gtk; then
+ local libdir
+ libdir="$(get_libdir)"
+ # on some arches it ends up in lib even on 64bit, ppc64 for instance.
+ [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
+ mv "${ED}"/usr/${libdir}/libperf-gtk.so \
+ "${ED}"/usr/libexec/perf-core || die
+ fi
+
+ dodoc CREDITS
+
+ dodoc *txt Documentation/*.txt
+
+ # perf needs this decompressed to print out tips for users
+ docompress -x /usr/share/doc/${PF}/tips.txt
+
+ if use doc ; then
+ doman Documentation/*.1
+ fi
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-10-30 9:25 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2023-10-30 9:25 UTC (permalink / raw
To: gentoo-commits
commit: dcbae2889c4cc9dbee05965954910280ee231c5a
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 30 08:10:08 2023 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Mon Oct 30 09:25:21 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcbae288
dev-util/perf: remove empty assignment to SRC_URI
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/perf-6.3.ebuild | 1 -
dev-util/perf/perf-6.5.ebuild | 1 -
2 files changed, 2 deletions(-)
diff --git a/dev-util/perf/perf-6.3.ebuild b/dev-util/perf/perf-6.3.ebuild
index 8f0ac9a76ce4..7969607f7994 100644
--- a/dev-util/perf/perf-6.3.ebuild
+++ b/dev-util/perf/perf-6.3.ebuild
@@ -23,7 +23,6 @@ elif [[ ${PV} == *.*.* ]] ; then
SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
else
LINUX_VER=${PV}
- SRC_URI=""
fi
LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
diff --git a/dev-util/perf/perf-6.5.ebuild b/dev-util/perf/perf-6.5.ebuild
index a1a140af0ed7..63a36103e1f1 100644
--- a/dev-util/perf/perf-6.5.ebuild
+++ b/dev-util/perf/perf-6.5.ebuild
@@ -23,7 +23,6 @@ elif [[ ${PV} == *.*.* ]] ; then
SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
else
LINUX_VER=${PV}
- SRC_URI=""
fi
LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-10-30 9:25 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2023-10-30 9:25 UTC (permalink / raw
To: gentoo-commits
commit: e13c85b079360f3eec022026813de66aa249d5ac
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 30 08:09:11 2023 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Mon Oct 30 09:25:21 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e13c85b0
dev-util/perf: drop 6.3-r1, 6.4-r1
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/Manifest | 1 -
dev-util/perf/perf-6.3-r1.ebuild | 278 ----------------------------------
dev-util/perf/perf-6.4-r1.ebuild | 313 ---------------------------------------
3 files changed, 592 deletions(-)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index f24a9347ce54..c4f16a986c7e 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,3 +1,2 @@
DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
-DIST linux-6.4.tar.xz 137794856 BLAKE2B b59eb04a8715af9f686978812e6d4a466172bb859f80657076de14cd0828b4fac15b688ff8959f5c65485f7f6bef26590412c66821e720de843cb8666f226c90 SHA512 11a48b25e0b513782d3b89101c2ec8dd9cefd6ce08dc63a91137903b66392aa72ca1fe32816710673af84dd47de3ab8738056a6af93dc0d5e60ef4b869b49928
DIST linux-6.5.tar.xz 138898084 BLAKE2B 2e641b79a080e8f4ce283bcf6b74e2c6f15a374367f1c4c875c663868dbe801317340824fb3adb46b3a51d3b7e1f67cc4e8144d367621ec43ffba5c4eb8abb39 SHA512 1b59dc5e65d4922c3217a8c8f19022dfd6595ae89747861d825bfeb51a4ae6c85449d05db69635a712bef7b355b80318195665582d8933b1fed6ba582f6ff257
diff --git a/dev-util/perf/perf-6.3-r1.ebuild b/dev-util/perf/perf-6.3-r1.ebuild
deleted file mode 100644
index d519238f14e1..000000000000
--- a/dev-util/perf/perf-6.3-r1.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit bash-completion-r1 estack flag-o-matic llvm toolchain-funcs python-r1 linux-info
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
- LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
- PATCH_VERSION=$(ver_cut 1-3)
- LINUX_PATCH=patch-${PV//_/-}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
- https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ ${PV} == *.*.* ]] ; then
- # stable-release series
- LINUX_VER=$(ver_cut 1-2)
- LINUX_PATCH=patch-${PV}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
- LINUX_VER=${PV}
- SRC_URI=""
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-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 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit babeltrace caps clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zstd"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# setuptools (and Python) are always needed even if not building Python bindings
-BDEPEND="
- ${LINUX_PATCH+dev-util/patchutils}
- ${PYTHON_DEPS}
- >=app-arch/tar-1.34-r2
- dev-python/setuptools[${PYTHON_USEDEP}]
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- doc? (
- app-text/asciidoc
- app-text/sgml-common
- app-text/xmlto
- sys-process/time
- )
-"
-
-RDEPEND="
- audit? ( sys-process/audit )
- babeltrace? ( dev-util/babeltrace )
- caps? ( sys-libs/libcap )
- clang? (
- sys-devel/clang:=
- sys-devel/llvm:=
- )
- crypt? ( dev-libs/openssl:= )
- gtk? ( x11-libs/gtk+:2 )
- java? ( virtual/jre:* )
- libpfm? ( dev-libs/libpfm:= )
- lzma? ( app-arch/xz-utils )
- numa? ( sys-process/numactl )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- slang? ( sys-libs/slang )
- systemtap? ( dev-util/systemtap )
- unwind? ( sys-libs/libunwind:= )
- zstd? ( app-arch/zstd:= )
- dev-libs/elfutils
- sys-libs/binutils-libs:=
- sys-libs/zlib
-"
-
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-5.10
- java? ( virtual/jdk )
-"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-QA_FLAGS_IGNORED=(
- 'usr/bin/perf-read-vdso32' # not linked with anything except for libc
- 'usr/libexec/perf-core/dlfilters/.*' # plugins
-)
-
-pkg_pretend() {
- if ! use doc ; then
- ewarn "Without the doc USE flag you won't get any documentation nor man pages."
- ewarn "And without man pages, you won't get any --help output for perf and its"
- ewarn "sub-tools."
- fi
-}
-
-pkg_setup() {
- use clang && llvm_pkg_setup
- # We enable python unconditionally as libbpf always generates
- # API headers using python script
- python_setup
-}
-
-# src_unpack and src_prepare are copied to dev-util/bpftool since
-# it's building from the same tarball, please keep it in sync with bpftool
-src_unpack() {
- local paths=(
- tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
- scripts include lib "arch/*/lib"
- )
-
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
- > ${P}.patch
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- done
-}
-
-src_prepare() {
- default
- if [[ -n ${LINUX_PATCH} ]] ; then
- pushd "${S_K}" >/dev/null || die
- eapply "${WORKDIR}"/${P}.patch
- popd || die
- fi
-
- pushd "${S_K}" >/dev/null || die
- eapply "${FILESDIR}"/perf-6.0-clang.patch
- eapply "${FILESDIR}"/perf-6.0-c++17.patch
- popd || die
-
- # 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 \
- "${S_K}"/tools/lib/perf/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' {} +
-}
-
-puse() { usex $1 "" no; }
-perf_make() {
- # The arch parsing is a bit funky. The perf tools package is integrated
- # into the kernel, so it wants an ARCH that looks like the kernel arch,
- # but it also wants to know about the split value -- i386/x86_64 vs just
- # x86. We can get that by telling the func to use an older linux version.
- # It's kind of a hack, but not that bad ...
-
- # LIBDIR sets a search path of perf-gtk.so. Bug 515954
-
- local arch=$(tc-arch-kernel)
- local java_dir
- use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
- # FIXME: NO_CORESIGHT
- local emakeargs=(
- 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)"
- PKG_CONFIG="$(tc-getPKG_CONFIG)"
- prefix="${EPREFIX}/usr" bindir_relative="bin"
- tipdir="share/doc/${PF}"
- EXTRA_CFLAGS="${CFLAGS}"
- EXTRA_LDFLAGS="${LDFLAGS}"
- ARCH="${arch}"
- JDIR="${java_dir}"
- LIBCLANGLLVM=$(usex clang 1 "")
- LIBPFM4=$(usex libpfm 1 "")
- NO_AUXTRACE=""
- NO_BACKTRACE=""
- NO_CORESIGHT=1
- NO_DEMANGLE=
- GTK2=$(usex gtk 1 "")
- feature-gtk2-infobar=$(usex gtk 1 "")
- NO_JVMTI=$(puse java)
- NO_LIBAUDIT=$(puse audit)
- NO_LIBBABELTRACE=$(puse babeltrace)
- NO_LIBBIONIC=1
- NO_LIBBPF=
- NO_LIBCAP=$(puse caps)
- NO_LIBCRYPTO=$(puse crypt)
- NO_LIBDW_DWARF_UNWIND=
- NO_LIBELF=
- NO_LIBNUMA=$(puse numa)
- NO_LIBPERL=$(puse perl)
- NO_LIBPYTHON=$(puse python)
- NO_LIBUNWIND=$(puse unwind)
- NO_LIBZSTD=$(puse zstd)
- NO_SDT=$(puse systemtap)
- NO_SLANG=$(puse slang)
- NO_LZMA=$(puse lzma)
- NO_ZLIB=
- WERROR=0
- LIBDIR="/usr/libexec/perf-core"
- libdir="${EPREFIX}/usr/$(get_libdir)"
- plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins"
- "$@"
- )
- emake "${emakeargs[@]}"
-}
-
-src_compile() {
- filter-lto
-
- # test-clang.bin not build with g++
- if use clang; then
- make -C "${S_K}/tools/build/feature" V=1 CXX=${CHOST}-clang++ test-clang.bin || die
- fi
- perf_make -f Makefile.perf
- use doc && perf_make -C Documentation man
-}
-
-src_test() {
- :
-}
-
-src_install() {
- _install_python_ext() {
- perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
- }
-
- perf_make -f Makefile.perf install DESTDIR="${D}"
-
- if use python; then
- python_foreach_impl _install_python_ext
- fi
-
- if use gtk; then
- local libdir
- libdir="$(get_libdir)"
- # on some arches it ends up in lib even on 64bit, ppc64 for instance.
- [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
- mv "${ED}"/usr/${libdir}/libperf-gtk.so \
- "${ED}"/usr/libexec/perf-core || die
- fi
-
- dodoc CREDITS
-
- dodoc *txt Documentation/*.txt
-
- # perf needs this decompressed to print out tips for users
- docompress -x /usr/share/doc/${PF}/tips.txt
-
- if use doc ; then
- doman Documentation/*.1
- fi
-}
diff --git a/dev-util/perf/perf-6.4-r1.ebuild b/dev-util/perf/perf-6.4-r1.ebuild
deleted file mode 100644
index a1a140af0ed7..000000000000
--- a/dev-util/perf/perf-6.4-r1.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit bash-completion-r1 estack flag-o-matic linux-info llvm toolchain-funcs python-r1
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
- LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
- PATCH_VERSION=$(ver_cut 1-3)
- LINUX_PATCH=patch-${PV//_/-}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
- https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ ${PV} == *.*.* ]] ; then
- # stable-release series
- LINUX_VER=$(ver_cut 1-2)
- LINUX_PATCH=patch-${PV}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
- LINUX_VER=${PV}
- SRC_URI=""
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit babeltrace bpf caps clang crypt debug +doc gtk java libpfm libtraceevent libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
-
-REQUIRED_USE="
- bpf? ( clang )
- ${PYTHON_REQUIRED_USE}
-"
-
-# setuptools (and Python) are always needed even if not building Python bindings
-BDEPEND="
- ${LINUX_PATCH+dev-util/patchutils}
- ${PYTHON_DEPS}
- >=app-arch/tar-1.34-r2
- dev-python/setuptools[${PYTHON_USEDEP}]
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- doc? (
- app-text/asciidoc
- app-text/sgml-common
- app-text/xmlto
- sys-process/time
- )
-"
-
-RDEPEND="
- audit? ( sys-process/audit )
- babeltrace? ( dev-util/babeltrace )
- bpf? (
- dev-libs/libbpf
- dev-util/bpftool
- dev-util/pahole
- )
- caps? ( sys-libs/libcap )
- clang? (
- sys-devel/clang:=
- sys-devel/llvm:=
- )
- crypt? ( dev-libs/openssl:= )
- gtk? ( x11-libs/gtk+:2 )
- java? ( virtual/jre:* )
- libpfm? ( dev-libs/libpfm:= )
- libtraceevent? ( dev-libs/libtraceevent )
- libtracefs? ( dev-libs/libtracefs )
- lzma? ( app-arch/xz-utils )
- numa? ( sys-process/numactl )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- slang? ( sys-libs/slang )
- systemtap? ( dev-util/systemtap )
- tcmalloc? ( dev-util/google-perftools )
- unwind? ( sys-libs/libunwind:= )
- zstd? ( app-arch/zstd:= )
- dev-libs/elfutils
- sys-libs/binutils-libs:=
- sys-libs/zlib
-"
-
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-5.10
- java? ( virtual/jdk )
-"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
-CONFIG_CHECK="
- ~DEBUG_INFO
- ~FTRACE
- ~FTRACE_SYSCALLS
- ~FUNCTION_TRACER
- ~KALLSYMS
- ~KALLSYMS_ALL
- ~KPROBES
- ~KPROBE_EVENTS
- ~PERF_EVENTS
- ~UPROBES
- ~UPROBE_EVENTS
-"
-
-QA_FLAGS_IGNORED=(
- 'usr/bin/perf-read-vdso32' # not linked with anything except for libc
- 'usr/libexec/perf-core/dlfilters/.*' # plugins
-)
-
-pkg_pretend() {
- if ! use doc ; then
- ewarn "Without the doc USE flag you won't get any documentation nor man pages."
- ewarn "And without man pages, you won't get any --help output for perf and its"
- ewarn "sub-tools."
- fi
-}
-
-pkg_setup() {
- use clang && llvm_pkg_setup
- # We enable python unconditionally as libbpf always generates
- # API headers using python script
- python_setup
-
- if use bpf ; then
- CONFIG_CHECK+="~BPF ~BPF_EVENTS ~BPF_SYSCALL ~DEBUG_INFO_BTF ~HAVE_EBPF_JIT"
- fi
-
- linux-info_pkg_setup
-}
-
-# src_unpack and src_prepare are copied to dev-util/bpftool since
-# it's building from the same tarball, please keep it in sync with bpftool
-src_unpack() {
- local paths=(
- kernel/bpf tools/{arch,bpf,build,include,lib,perf,scripts}
- scripts include lib "arch/*/lib"
- )
-
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
- > ${P}.patch
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- done
-}
-
-src_prepare() {
- default
- if [[ -n ${LINUX_PATCH} ]] ; then
- pushd "${S_K}" >/dev/null || die
- eapply "${WORKDIR}"/${P}.patch
- popd || die
- fi
-
- pushd "${S_K}" >/dev/null || die
- eapply "${FILESDIR}"/perf-6.0-clang.patch
- eapply "${FILESDIR}"/perf-6.0-c++17.patch
- eapply "${FILESDIR}"/perf-6.4-libtracefs.patch
- popd || die
-
- # 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 \
- "${S_K}"/tools/lib/perf/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' {} +
-}
-
-puse() { usex $1 "" 1; }
-perf_make() {
- # The arch parsing is a bit funky. The perf tools package is integrated
- # into the kernel, so it wants an ARCH that looks like the kernel arch,
- # but it also wants to know about the split value -- i386/x86_64 vs just
- # x86. We can get that by telling the func to use an older linux version.
- # It's kind of a hack, but not that bad ...
-
- # LIBDIR sets a search path of perf-gtk.so. Bug 515954
-
- local arch=$(tc-arch-kernel)
- local java_dir
- use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
- # FIXME: NO_CORESIGHT
- local emakeargs=(
- 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)"
- PKG_CONFIG="$(tc-getPKG_CONFIG)"
- prefix="${EPREFIX}/usr" bindir_relative="bin"
- tipdir="share/doc/${PF}"
- EXTRA_CFLAGS="${CFLAGS}"
- EXTRA_LDFLAGS="${LDFLAGS}"
- ARCH="${arch}"
- BUILD_BPF_SKEL=$(usex bpf 1 "") \
- BUILD_NONDISTRO=1
- JDIR="${java_dir}"
- CORESIGHT=
- GTK2=$(usex gtk 1 "")
- LIBCLANGLLVM=$(usex clang 1 "")
- feature-gtk2-infobar=$(usex gtk 1 "")
- NO_AUXTRACE=
- NO_BACKTRACE=
- NO_DEMANGLE=
- NO_JEVENTS=$(puse python)
- NO_JVMTI=$(puse java)
- NO_LIBAUDIT=$(puse audit)
- NO_LIBBABELTRACE=$(puse babeltrace)
- NO_LIBBIONIC=1
- NO_LIBBPF=$(puse bpf)
- NO_LIBCAP=$(puse caps)
- NO_LIBCRYPTO=$(puse crypt)
- NO_LIBDW_DWARF_UNWIND=
- NO_LIBELF=
- NO_LIBNUMA=$(puse numa)
- NO_LIBPERL=$(puse perl)
- NO_LIBPFM4=$(puse libpfm)
- NO_LIBPYTHON=$(puse python)
- NO_LIBTRACEEVENT=$(puse libtraceevent)
- NO_LIBUNWIND=$(puse unwind)
- NO_LIBZSTD=$(puse zstd)
- NO_SDT=$(puse systemtap)
- NO_SLANG=$(puse slang)
- NO_LZMA=$(puse lzma)
- NO_ZLIB=
- TCMALLOC=$(usex tcmalloc 1 "")
- WERROR=0
- LIBDIR="/usr/libexec/perf-core"
- libdir="${EPREFIX}/usr/$(get_libdir)"
- plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins"
- "$@"
- )
- emake "${emakeargs[@]}"
-}
-
-src_compile() {
- filter-lto
-
- # test-clang.bin not build with g++
- if use clang; then
- make -C "${S_K}/tools/build/feature" V=1 CXX=${CHOST}-clang++ test-clang.bin || die
- fi
- perf_make -f Makefile.perf
- use doc && perf_make -C Documentation man
-}
-
-src_test() {
- :
-}
-
-src_install() {
- _install_python_ext() {
- perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
- }
-
- perf_make -f Makefile.perf install DESTDIR="${D}"
-
- if use python; then
- python_foreach_impl _install_python_ext
- fi
-
- if use gtk; then
- local libdir
- libdir="$(get_libdir)"
- # on some arches it ends up in lib even on 64bit, ppc64 for instance.
- [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
- mv "${ED}"/usr/${libdir}/libperf-gtk.so \
- "${ED}"/usr/libexec/perf-core || die
- fi
-
- dodoc CREDITS
-
- dodoc *txt Documentation/*.txt
-
- # perf needs this decompressed to print out tips for users
- docompress -x /usr/share/doc/${PF}/tips.txt
-
- if use doc ; then
- doman Documentation/*.1
- fi
-}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-10-30 9:25 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2023-10-30 9:25 UTC (permalink / raw
To: gentoo-commits
commit: 5b3cdf80b16a0c286c96adc0fdee17564a36a298
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 30 09:20:52 2023 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Mon Oct 30 09:25:21 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b3cdf80
dev-util/perf: add 6.6
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/Manifest | 1 +
dev-util/perf/perf-6.6.ebuild | 304 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 305 insertions(+)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index c4f16a986c7e..375121b21e33 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,2 +1,3 @@
DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
DIST linux-6.5.tar.xz 138898084 BLAKE2B 2e641b79a080e8f4ce283bcf6b74e2c6f15a374367f1c4c875c663868dbe801317340824fb3adb46b3a51d3b7e1f67cc4e8144d367621ec43ffba5c4eb8abb39 SHA512 1b59dc5e65d4922c3217a8c8f19022dfd6595ae89747861d825bfeb51a4ae6c85449d05db69635a712bef7b355b80318195665582d8933b1fed6ba582f6ff257
+DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
diff --git a/dev-util/perf/perf-6.6.ebuild b/dev-util/perf/perf-6.6.ebuild
new file mode 100644
index 000000000000..b86fbd604b85
--- /dev/null
+++ b/dev-util/perf/perf-6.6.ebuild
@@ -0,0 +1,304 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit bash-completion-r1 estack flag-o-matic linux-info llvm toolchain-funcs python-r1
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+ LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+ PATCH_VERSION=$(ver_cut 1-3)
+ LINUX_PATCH=patch-${PV//_/-}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+ https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ ${PV} == *.*.* ]] ; then
+ # stable-release series
+ LINUX_VER=$(ver_cut 1-2)
+ LINUX_PATCH=patch-${PV}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+ LINUX_VER=${PV}
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit babeltrace bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+"
+
+# setuptools (and Python) are always needed even if not building Python bindings
+BDEPEND="
+ ${LINUX_PATCH+dev-util/patchutils}
+ ${PYTHON_DEPS}
+ >=app-arch/tar-1.34-r2
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+ doc? (
+ app-text/asciidoc
+ app-text/sgml-common
+ app-text/xmlto
+ sys-process/time
+ )
+"
+
+RDEPEND="
+ audit? ( sys-process/audit )
+ babeltrace? ( dev-util/babeltrace )
+ bpf? (
+ dev-libs/libbpf
+ dev-util/bpftool
+ dev-util/pahole
+ )
+ caps? ( sys-libs/libcap )
+ bpf? (
+ sys-devel/clang:=
+ sys-devel/llvm:=
+ )
+ crypt? ( dev-libs/openssl:= )
+ gtk? ( x11-libs/gtk+:2 )
+ java? ( virtual/jre:* )
+ libpfm? ( dev-libs/libpfm:= )
+ libtraceevent? ( dev-libs/libtraceevent )
+ libtracefs? ( dev-libs/libtracefs )
+ lzma? ( app-arch/xz-utils )
+ numa? ( sys-process/numactl )
+ perl? ( dev-lang/perl:= )
+ python? ( ${PYTHON_DEPS} )
+ slang? ( sys-libs/slang )
+ systemtap? ( dev-util/systemtap )
+ tcmalloc? ( dev-util/google-perftools )
+ unwind? ( sys-libs/libunwind:= )
+ zstd? ( app-arch/zstd:= )
+ dev-libs/elfutils
+ sys-libs/binutils-libs:=
+ sys-libs/zlib
+"
+
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-5.10
+ java? ( virtual/jdk )
+"
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
+CONFIG_CHECK="
+ ~DEBUG_INFO
+ ~FTRACE
+ ~FTRACE_SYSCALLS
+ ~FUNCTION_TRACER
+ ~KALLSYMS
+ ~KALLSYMS_ALL
+ ~KPROBES
+ ~KPROBE_EVENTS
+ ~PERF_EVENTS
+ ~UPROBES
+ ~UPROBE_EVENTS
+"
+
+QA_FLAGS_IGNORED=(
+ 'usr/bin/perf-read-vdso32' # not linked with anything except for libc
+ 'usr/libexec/perf-core/dlfilters/.*' # plugins
+)
+
+pkg_pretend() {
+ if ! use doc ; then
+ ewarn "Without the doc USE flag you won't get any documentation nor man pages."
+ ewarn "And without man pages, you won't get any --help output for perf and its"
+ ewarn "sub-tools."
+ fi
+}
+
+pkg_setup() {
+ use bpf && llvm_pkg_setup
+ # We enable python unconditionally as libbpf always generates
+ # API headers using python script
+ python_setup
+
+ if use bpf ; then
+ CONFIG_CHECK+="~BPF ~BPF_EVENTS ~BPF_SYSCALL ~DEBUG_INFO_BTF ~HAVE_EBPF_JIT"
+ fi
+
+ linux-info_pkg_setup
+}
+
+# src_unpack and src_prepare are copied to dev-util/bpftool since
+# it's building from the same tarball, please keep it in sync with bpftool
+src_unpack() {
+ local paths=(
+ kernel/bpf tools/{arch,bpf,build,include,lib,perf,scripts}
+ scripts include lib "arch/*/lib"
+ )
+
+ # We expect the tar implementation to support the -j option (both
+ # GNU tar and libarchive's tar support that).
+ echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+ gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+ "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ eshopts_push -o noglob
+ ebegin "Filtering partial source patch"
+ filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+ > ${P}.patch
+ eend $? || die "filterdiff failed"
+ eshopts_pop
+ fi
+
+ local a
+ for a in ${A}; do
+ [[ ${a} == ${LINUX_SOURCES} ]] && continue
+ [[ ${a} == ${LINUX_PATCH} ]] && continue
+ unpack ${a}
+ done
+}
+
+src_prepare() {
+ default
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ pushd "${S_K}" >/dev/null || die
+ eapply "${WORKDIR}"/${P}.patch
+ popd || die
+ fi
+
+ pushd "${S_K}" >/dev/null || die
+ eapply "${FILESDIR}"/perf-6.4-libtracefs.patch
+ popd || die
+
+ # 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 \
+ "${S_K}"/tools/lib/perf/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' {} +
+}
+
+puse() { usex $1 "" 1; }
+perf_make() {
+ # The arch parsing is a bit funky. The perf tools package is integrated
+ # into the kernel, so it wants an ARCH that looks like the kernel arch,
+ # but it also wants to know about the split value -- i386/x86_64 vs just
+ # x86. We can get that by telling the func to use an older linux version.
+ # It's kind of a hack, but not that bad ...
+
+ # LIBDIR sets a search path of perf-gtk.so. Bug 515954
+
+ local arch=$(tc-arch-kernel)
+ local java_dir
+ use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
+ # FIXME: NO_CORESIGHT
+ local emakeargs=(
+ 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)"
+ PKG_CONFIG="$(tc-getPKG_CONFIG)"
+ prefix="${EPREFIX}/usr" bindir_relative="bin"
+ tipdir="share/doc/${PF}"
+ EXTRA_CFLAGS="${CFLAGS}"
+ EXTRA_LDFLAGS="${LDFLAGS}"
+ ARCH="${arch}"
+ BUILD_BPF_SKEL=$(usex bpf 1 "") \
+ BUILD_NONDISTRO=1
+ JDIR="${java_dir}"
+ CORESIGHT=
+ GTK2=$(usex gtk 1 "")
+ feature-gtk2-infobar=$(usex gtk 1 "")
+ NO_AUXTRACE=
+ NO_BACKTRACE=
+ NO_DEMANGLE=
+ NO_JEVENTS=$(puse python)
+ NO_JVMTI=$(puse java)
+ NO_LIBAUDIT=$(puse audit)
+ NO_LIBBABELTRACE=$(puse babeltrace)
+ NO_LIBBIONIC=1
+ NO_LIBBPF=$(puse bpf)
+ NO_LIBCAP=$(puse caps)
+ NO_LIBCRYPTO=$(puse crypt)
+ NO_LIBDW_DWARF_UNWIND=
+ NO_LIBELF=
+ NO_LIBNUMA=$(puse numa)
+ NO_LIBPERL=$(puse perl)
+ NO_LIBPFM4=$(puse libpfm)
+ NO_LIBPYTHON=$(puse python)
+ NO_LIBTRACEEVENT=$(puse libtraceevent)
+ NO_LIBUNWIND=$(puse unwind)
+ NO_LIBZSTD=$(puse zstd)
+ NO_SDT=$(puse systemtap)
+ NO_SLANG=$(puse slang)
+ NO_LZMA=$(puse lzma)
+ NO_ZLIB=
+ TCMALLOC=$(usex tcmalloc 1 "")
+ WERROR=0
+ LIBDIR="/usr/libexec/perf-core"
+ libdir="${EPREFIX}/usr/$(get_libdir)"
+ plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins"
+ "$@"
+ )
+ emake "${emakeargs[@]}"
+}
+
+src_compile() {
+ filter-lto
+
+ perf_make -f Makefile.perf
+ use doc && perf_make -C Documentation man
+}
+
+src_test() {
+ :
+}
+
+src_install() {
+ _install_python_ext() {
+ perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
+ }
+
+ perf_make -f Makefile.perf install DESTDIR="${D}"
+
+ if use python; then
+ python_foreach_impl _install_python_ext
+ fi
+
+ if use gtk; then
+ local libdir
+ libdir="$(get_libdir)"
+ # on some arches it ends up in lib even on 64bit, ppc64 for instance.
+ [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
+ mv "${ED}"/usr/${libdir}/libperf-gtk.so \
+ "${ED}"/usr/libexec/perf-core || die
+ fi
+
+ dodoc CREDITS
+
+ dodoc *txt Documentation/*.txt
+
+ # perf needs this decompressed to print out tips for users
+ docompress -x /usr/share/doc/${PF}/tips.txt
+
+ if use doc ; then
+ doman Documentation/*.1
+ fi
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-12-28 2:57 Sam James
0 siblings, 0 replies; 141+ messages in thread
From: Sam James @ 2023-12-28 2:57 UTC (permalink / raw
To: gentoo-commits
commit: cafbbb74da16b630715015956cbaa62f1722008b
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Tue Dec 19 22:50:52 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 02:55:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cafbbb74
dev-util/perf: mirror kernel restrictions for libdw support
Kernel has a whitelist of architectures for which unwind via libdw is
supported. Right now the ebuild unconditionally enables it, this fails
on architectures where kernel support is not merged (e.g. alpha).
This list needs to be checked and synced on updates. There shouldn't be
anything removed from it in the future, only added.
Bug: https://bugs.gentoo.org/759754
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Closes: https://github.com/gentoo/gentoo/pull/34376
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/perf/perf-6.3.ebuild | 15 ++++++++++++++-
dev-util/perf/perf-6.5.ebuild | 16 +++++++++++++++-
dev-util/perf/perf-6.6.ebuild | 16 +++++++++++++++-
3 files changed, 44 insertions(+), 3 deletions(-)
diff --git a/dev-util/perf/perf-6.3.ebuild b/dev-util/perf/perf-6.3.ebuild
index 7969607f7994..e3f009470d74 100644
--- a/dev-util/perf/perf-6.3.ebuild
+++ b/dev-util/perf/perf-6.3.ebuild
@@ -179,6 +179,19 @@ perf_make() {
local arch=$(tc-arch-kernel)
local java_dir
use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
+
+ # sync this with the whitelist in tools/perf/Makefile.config
+ local disable_libdw
+ if ! use amd64 && ! use x86 && \
+ ! use arm && \
+ ! use arm64 && \
+ ! use ppc && ! use ppc64 \
+ ! use s390 && \
+ ! use riscv
+ then
+ disable_libdw=1
+ fi
+
# FIXME: NO_CORESIGHT
emake V=1 VF=1 \
HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \
@@ -204,7 +217,7 @@ perf_make() {
NO_LIBBIONIC=1 \
NO_LIBBPF= \
NO_LIBCRYPTO=$(puse crypt) \
- NO_LIBDW_DWARF_UNWIND= \
+ NO_LIBDW_DWARF_UNWIND="${disable_libdw}" \
NO_LIBELF= \
NO_LIBNUMA=$(puse numa) \
NO_LIBPERL=$(puse perl) \
diff --git a/dev-util/perf/perf-6.5.ebuild b/dev-util/perf/perf-6.5.ebuild
index 63a36103e1f1..128f4fd8b60a 100644
--- a/dev-util/perf/perf-6.5.ebuild
+++ b/dev-util/perf/perf-6.5.ebuild
@@ -212,6 +212,20 @@ perf_make() {
local arch=$(tc-arch-kernel)
local java_dir
use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
+
+ # sync this with the whitelist in tools/perf/Makefile.config
+ local disable_libdw
+ if ! use amd64 && ! use x86 && \
+ ! use arm && \
+ ! use arm64 && \
+ ! use ppc && ! use ppc64 \
+ ! use s390 && \
+ ! use riscv && \
+ ! use loong
+ then
+ disable_libdw=1
+ fi
+
# FIXME: NO_CORESIGHT
local emakeargs=(
V=1 VF=1
@@ -241,7 +255,7 @@ perf_make() {
NO_LIBBPF=$(puse bpf)
NO_LIBCAP=$(puse caps)
NO_LIBCRYPTO=$(puse crypt)
- NO_LIBDW_DWARF_UNWIND=
+ NO_LIBDW_DWARF_UNWIND="${disable_libdw}"
NO_LIBELF=
NO_LIBNUMA=$(puse numa)
NO_LIBPERL=$(puse perl)
diff --git a/dev-util/perf/perf-6.6.ebuild b/dev-util/perf/perf-6.6.ebuild
index b86fbd604b85..762843d662bf 100644
--- a/dev-util/perf/perf-6.6.ebuild
+++ b/dev-util/perf/perf-6.6.ebuild
@@ -209,6 +209,20 @@ perf_make() {
local arch=$(tc-arch-kernel)
local java_dir
use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
+
+ # sync this with the whitelist in tools/perf/Makefile.config
+ local disable_libdw
+ if ! use amd64 && ! use x86 && \
+ ! use arm && \
+ ! use arm64 && \
+ ! use ppc && ! use ppc64 \
+ ! use s390 && \
+ ! use riscv && \
+ ! use loong
+ then
+ disable_libdw=1
+ fi
+
# FIXME: NO_CORESIGHT
local emakeargs=(
V=1 VF=1
@@ -237,7 +251,7 @@ perf_make() {
NO_LIBBPF=$(puse bpf)
NO_LIBCAP=$(puse caps)
NO_LIBCRYPTO=$(puse crypt)
- NO_LIBDW_DWARF_UNWIND=
+ NO_LIBDW_DWARF_UNWIND="${disable_libdw}"
NO_LIBELF=
NO_LIBNUMA=$(puse numa)
NO_LIBPERL=$(puse perl)
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2023-12-30 1:26 Ionen Wolkens
0 siblings, 0 replies; 141+ messages in thread
From: Ionen Wolkens @ 2023-12-30 1:26 UTC (permalink / raw
To: gentoo-commits
commit: 28ab25b2e1c8c856a062ca27b336124a43ec167f
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Fri Dec 29 15:24:59 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Dec 30 01:10:11 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28ab25b2
dev-util/perf: Keyword 6.6 alpha, #759754
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-util/perf/perf-6.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-6.6.ebuild b/dev-util/perf/perf-6.6.ebuild
index 762843d662bf..5f93ba5de347 100644
--- a/dev-util/perf/perf-6.6.ebuild
+++ b/dev-util/perf/perf-6.6.ebuild
@@ -30,7 +30,7 @@ SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE="audit babeltrace bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
REQUIRED_USE="
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2024-01-05 5:30 Sam James
0 siblings, 0 replies; 141+ messages in thread
From: Sam James @ 2024-01-05 5:30 UTC (permalink / raw
To: gentoo-commits
commit: 4cdc03559b16a0a303ebf5634487d93bf91d0298
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Fri Jan 5 03:46:54 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 5 05:29:57 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cdc0355
dev-util/perf: explicitly specify linker emulation for mips
perf directly invokes LD for linking rather than going through CC, which
on mips requires explicitly specifying the emulation. This is a port of
the below buildroot patch.
See: https://patchwork.ozlabs.org/project/buildroot/patch/20170217105905.32151-1-Vincent.Riera <AT> imgtec.com/
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Closes: https://github.com/gentoo/gentoo/pull/34648
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/perf/perf-6.6.ebuild | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/dev-util/perf/perf-6.6.ebuild b/dev-util/perf/perf-6.6.ebuild
index 5f93ba5de347..206b06714a2f 100644
--- a/dev-util/perf/perf-6.6.ebuild
+++ b/dev-util/perf/perf-6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -31,7 +31,7 @@ SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit babeltrace bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
+IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 audit babeltrace big-endian bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
@@ -223,11 +223,29 @@ perf_make() {
disable_libdw=1
fi
+ # perf directly invokes LD for linking without going through CC, on mips
+ # it is required to specify the emulation. port of below buildroot patch
+ # https://patchwork.ozlabs.org/project/buildroot/patch/20170217105905.32151-1-Vincent.Riera@imgtec.com/
+ local linker="$(tc-getLD)"
+ if use mips
+ then
+ if use big-endian
+ then
+ use abi_mips_n64 && linker+=" -m elf64btsmip"
+ use abi_mips_n32 && linker+=" -m elf32btsmipn32"
+ use abi_mips_o32 && linker+=" -m elf32btsmip"
+ else
+ use abi_mips_n64 && linker+=" -m elf64ltsmip"
+ use abi_mips_n32 && linker+=" -m elf32ltsmipn32"
+ use abi_mips_o32 && linker+=" -m elf32ltsmip"
+ fi
+ fi
+
# FIXME: NO_CORESIGHT
local emakeargs=(
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)"
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="${linker}" NM="$(tc-getNM)"
PKG_CONFIG="$(tc-getPKG_CONFIG)"
prefix="${EPREFIX}/usr" bindir_relative="bin"
tipdir="share/doc/${PF}"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2024-01-30 14:36 Yixun Lan
0 siblings, 0 replies; 141+ messages in thread
From: Yixun Lan @ 2024-01-30 14:36 UTC (permalink / raw
To: gentoo-commits
commit: 85fa5d9f2326a0aa8579a076a16ff46b5becb570
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 30 14:32:57 2024 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Jan 30 14:33:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85fa5d9f
dev-util/perf: add 6.7
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
dev-util/perf/Manifest | 1 +
dev-util/perf/perf-6.7.ebuild | 336 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 337 insertions(+)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 375121b21e33..0ceb4c677bbe 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,3 +1,4 @@
DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
DIST linux-6.5.tar.xz 138898084 BLAKE2B 2e641b79a080e8f4ce283bcf6b74e2c6f15a374367f1c4c875c663868dbe801317340824fb3adb46b3a51d3b7e1f67cc4e8144d367621ec43ffba5c4eb8abb39 SHA512 1b59dc5e65d4922c3217a8c8f19022dfd6595ae89747861d825bfeb51a4ae6c85449d05db69635a712bef7b355b80318195665582d8933b1fed6ba582f6ff257
DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
+DIST linux-6.7.tar.xz 141406528 BLAKE2B cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e SHA512 de06de556191614bd9daf077ae239360352a402bab407748e67f1e5108c92fd933e451707840ab22fe0f9976db3d1e1b60ca9d41cf894f015ca09b3f652b74ad
diff --git a/dev-util/perf/perf-6.7.ebuild b/dev-util/perf/perf-6.7.ebuild
new file mode 100644
index 000000000000..45ad2f3ededd
--- /dev/null
+++ b/dev-util/perf/perf-6.7.ebuild
@@ -0,0 +1,336 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit bash-completion-r1 estack flag-o-matic linux-info llvm toolchain-funcs python-r1
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+ LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+ PATCH_VERSION=$(ver_cut 1-3)
+ LINUX_PATCH=patch-${PV//_/-}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+ https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ ${PV} == *.*.* ]] ; then
+ # stable-release series
+ LINUX_VER=$(ver_cut 1-2)
+ LINUX_PATCH=patch-${PV}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+ LINUX_VER=${PV}
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 audit babeltrace big-endian bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+"
+
+# setuptools (and Python) are always needed even if not building Python bindings
+BDEPEND="
+ ${LINUX_PATCH+dev-util/patchutils}
+ ${PYTHON_DEPS}
+ >=app-arch/tar-1.34-r2
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ app-alternatives/yacc
+ app-alternatives/lex
+ virtual/pkgconfig
+ doc? (
+ app-text/asciidoc
+ app-text/sgml-common
+ app-text/xmlto
+ sys-process/time
+ )
+"
+
+RDEPEND="
+ audit? ( sys-process/audit )
+ babeltrace? ( dev-util/babeltrace )
+ bpf? (
+ dev-libs/libbpf
+ dev-util/bpftool
+ dev-util/pahole
+ )
+ caps? ( sys-libs/libcap )
+ bpf? (
+ sys-devel/clang:=
+ sys-devel/llvm:=
+ )
+ crypt? ( dev-libs/openssl:= )
+ gtk? ( x11-libs/gtk+:2 )
+ java? ( virtual/jre:* )
+ libpfm? ( dev-libs/libpfm:= )
+ libtraceevent? ( dev-libs/libtraceevent )
+ libtracefs? ( dev-libs/libtracefs )
+ lzma? ( app-arch/xz-utils )
+ numa? ( sys-process/numactl )
+ perl? ( dev-lang/perl:= )
+ python? ( ${PYTHON_DEPS} )
+ slang? ( sys-libs/slang )
+ systemtap? ( dev-debug/systemtap )
+ tcmalloc? ( dev-util/google-perftools )
+ unwind? ( sys-libs/libunwind:= )
+ zstd? ( app-arch/zstd:= )
+ dev-libs/elfutils
+ sys-libs/binutils-libs:=
+ sys-libs/zlib
+"
+
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-5.10
+ java? ( virtual/jdk )
+"
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
+CONFIG_CHECK="
+ ~DEBUG_INFO
+ ~FTRACE
+ ~FTRACE_SYSCALLS
+ ~FUNCTION_TRACER
+ ~KALLSYMS
+ ~KALLSYMS_ALL
+ ~KPROBES
+ ~KPROBE_EVENTS
+ ~PERF_EVENTS
+ ~UPROBES
+ ~UPROBE_EVENTS
+"
+
+QA_FLAGS_IGNORED=(
+ 'usr/bin/perf-read-vdso32' # not linked with anything except for libc
+ 'usr/libexec/perf-core/dlfilters/.*' # plugins
+)
+
+pkg_pretend() {
+ if ! use doc ; then
+ ewarn "Without the doc USE flag you won't get any documentation nor man pages."
+ ewarn "And without man pages, you won't get any --help output for perf and its"
+ ewarn "sub-tools."
+ fi
+}
+
+pkg_setup() {
+ use bpf && llvm_pkg_setup
+ # We enable python unconditionally as libbpf always generates
+ # API headers using python script
+ python_setup
+
+ if use bpf ; then
+ CONFIG_CHECK+="~BPF ~BPF_EVENTS ~BPF_SYSCALL ~DEBUG_INFO_BTF ~HAVE_EBPF_JIT"
+ fi
+
+ linux-info_pkg_setup
+}
+
+# src_unpack and src_prepare are copied to dev-util/bpftool since
+# it's building from the same tarball, please keep it in sync with bpftool
+src_unpack() {
+ local paths=(
+ kernel/bpf tools/{arch,bpf,build,include,lib,perf,scripts}
+ scripts include lib "arch/*/lib" arch/arm64/tools
+ )
+
+ # We expect the tar implementation to support the -j option (both
+ # GNU tar and libarchive's tar support that).
+ echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+ gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+ "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ eshopts_push -o noglob
+ ebegin "Filtering partial source patch"
+ filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+ > ${P}.patch
+ eend $? || die "filterdiff failed"
+ eshopts_pop
+ fi
+
+ local a
+ for a in ${A}; do
+ [[ ${a} == ${LINUX_SOURCES} ]] && continue
+ [[ ${a} == ${LINUX_PATCH} ]] && continue
+ unpack ${a}
+ done
+}
+
+src_prepare() {
+ default
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ pushd "${S_K}" >/dev/null || die
+ eapply "${WORKDIR}"/${P}.patch
+ popd || die
+ fi
+
+ pushd "${S_K}" >/dev/null || die
+ eapply "${FILESDIR}"/perf-6.4-libtracefs.patch
+ popd || die
+
+ # 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 \
+ "${S_K}"/tools/lib/perf/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' {} +
+}
+
+puse() { usex $1 "" 1; }
+perf_make() {
+ # The arch parsing is a bit funky. The perf tools package is integrated
+ # into the kernel, so it wants an ARCH that looks like the kernel arch,
+ # but it also wants to know about the split value -- i386/x86_64 vs just
+ # x86. We can get that by telling the func to use an older linux version.
+ # It's kind of a hack, but not that bad ...
+
+ # LIBDIR sets a search path of perf-gtk.so. Bug 515954
+
+ local arch=$(tc-arch-kernel)
+ local java_dir
+ use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
+
+ # sync this with the whitelist in tools/perf/Makefile.config
+ local disable_libdw
+ if ! use amd64 && ! use x86 && \
+ ! use arm && \
+ ! use arm64 && \
+ ! use ppc && ! use ppc64 \
+ ! use s390 && \
+ ! use riscv && \
+ ! use loong
+ then
+ disable_libdw=1
+ fi
+
+ # perf directly invokes LD for linking without going through CC, on mips
+ # it is required to specify the emulation. port of below buildroot patch
+ # https://patchwork.ozlabs.org/project/buildroot/patch/20170217105905.32151-1-Vincent.Riera@imgtec.com/
+ local linker="$(tc-getLD)"
+ if use mips
+ then
+ if use big-endian
+ then
+ use abi_mips_n64 && linker+=" -m elf64btsmip"
+ use abi_mips_n32 && linker+=" -m elf32btsmipn32"
+ use abi_mips_o32 && linker+=" -m elf32btsmip"
+ else
+ use abi_mips_n64 && linker+=" -m elf64ltsmip"
+ use abi_mips_n32 && linker+=" -m elf32ltsmipn32"
+ use abi_mips_o32 && linker+=" -m elf32ltsmip"
+ fi
+ fi
+
+ # FIXME: NO_CORESIGHT
+ local emakeargs=(
+ V=1 VF=1
+ HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)"
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="${linker}" NM="$(tc-getNM)"
+ PKG_CONFIG="$(tc-getPKG_CONFIG)"
+ prefix="${EPREFIX}/usr" bindir_relative="bin"
+ tipdir="share/doc/${PF}"
+ EXTRA_CFLAGS="${CFLAGS}"
+ EXTRA_LDFLAGS="${LDFLAGS}"
+ ARCH="${arch}"
+ BUILD_BPF_SKEL=$(usex bpf 1 "") \
+ BUILD_NONDISTRO=1
+ JDIR="${java_dir}"
+ CORESIGHT=
+ GTK2=$(usex gtk 1 "")
+ feature-gtk2-infobar=$(usex gtk 1 "")
+ NO_AUXTRACE=
+ NO_BACKTRACE=
+ NO_DEMANGLE=
+ NO_JEVENTS=$(puse python)
+ NO_JVMTI=$(puse java)
+ NO_LIBAUDIT=$(puse audit)
+ NO_LIBBABELTRACE=$(puse babeltrace)
+ NO_LIBBIONIC=1
+ NO_LIBBPF=$(puse bpf)
+ NO_LIBCAP=$(puse caps)
+ NO_LIBCRYPTO=$(puse crypt)
+ NO_LIBDW_DWARF_UNWIND="${disable_libdw}"
+ NO_LIBELF=
+ NO_LIBNUMA=$(puse numa)
+ NO_LIBPERL=$(puse perl)
+ NO_LIBPFM4=$(puse libpfm)
+ NO_LIBPYTHON=$(puse python)
+ NO_LIBTRACEEVENT=$(puse libtraceevent)
+ NO_LIBUNWIND=$(puse unwind)
+ NO_LIBZSTD=$(puse zstd)
+ NO_SDT=$(puse systemtap)
+ NO_SLANG=$(puse slang)
+ NO_LZMA=$(puse lzma)
+ NO_ZLIB=
+ TCMALLOC=$(usex tcmalloc 1 "")
+ WERROR=0
+ LIBDIR="/usr/libexec/perf-core"
+ libdir="${EPREFIX}/usr/$(get_libdir)"
+ plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins"
+ "$@"
+ )
+ emake "${emakeargs[@]}"
+}
+
+src_compile() {
+ filter-lto
+
+ perf_make -f Makefile.perf
+ use doc && perf_make -C Documentation man
+}
+
+src_test() {
+ :
+}
+
+src_install() {
+ _install_python_ext() {
+ perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
+ }
+
+ perf_make -f Makefile.perf install DESTDIR="${D}"
+
+ if use python; then
+ python_foreach_impl _install_python_ext
+ fi
+
+ if use gtk; then
+ local libdir
+ libdir="$(get_libdir)"
+ # on some arches it ends up in lib even on 64bit, ppc64 for instance.
+ [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
+ mv "${ED}"/usr/${libdir}/libperf-gtk.so \
+ "${ED}"/usr/libexec/perf-core || die
+ fi
+
+ dodoc CREDITS
+
+ dodoc *txt Documentation/*.txt
+
+ # perf needs this decompressed to print out tips for users
+ docompress -x /usr/share/doc/${PF}/tips.txt
+
+ if use doc ; then
+ doman Documentation/*.1
+ fi
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2024-03-10 19:52 Arthur Zamarin
0 siblings, 0 replies; 141+ messages in thread
From: Arthur Zamarin @ 2024-03-10 19:52 UTC (permalink / raw
To: gentoo-commits
commit: 1ae19f23dd875c5f5d000bb851843d07f8c58b17
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 10 19:52:08 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 19:52:08 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ae19f23
dev-util/perf: Stabilize 6.7 x86, #916522
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-util/perf/perf-6.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-6.7.ebuild b/dev-util/perf/perf-6.7.ebuild
index 1abedb23fbcf..d16e08bca563 100644
--- a/dev-util/perf/perf-6.7.ebuild
+++ b/dev-util/perf/perf-6.7.ebuild
@@ -30,7 +30,7 @@ SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 audit babeltrace big-endian bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
REQUIRED_USE="
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2024-03-10 19:52 Arthur Zamarin
0 siblings, 0 replies; 141+ messages in thread
From: Arthur Zamarin @ 2024-03-10 19:52 UTC (permalink / raw
To: gentoo-commits
commit: 3c80f1b06f2f87c71a42f48c64cb1bf1ece6b069
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 10 19:52:06 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 19:52:06 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c80f1b0
dev-util/perf: Stabilize 6.7 amd64, #916522
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-util/perf/perf-6.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-6.7.ebuild b/dev-util/perf/perf-6.7.ebuild
index cc5b677f7e20..1abedb23fbcf 100644
--- a/dev-util/perf/perf-6.7.ebuild
+++ b/dev-util/perf/perf-6.7.ebuild
@@ -30,7 +30,7 @@ SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 audit babeltrace big-endian bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
REQUIRED_USE="
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2024-03-10 20:00 Arthur Zamarin
0 siblings, 0 replies; 141+ messages in thread
From: Arthur Zamarin @ 2024-03-10 20:00 UTC (permalink / raw
To: gentoo-commits
commit: 7a5b2f32b6e03b711ad1f3f63343328999129f85
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 10 20:00:32 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 20:00:32 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a5b2f32
dev-util/perf: Stabilize 6.7 ppc, #916522
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-util/perf/perf-6.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-6.7.ebuild b/dev-util/perf/perf-6.7.ebuild
index 531470248dbd..1c017c7af180 100644
--- a/dev-util/perf/perf-6.7.ebuild
+++ b/dev-util/perf/perf-6.7.ebuild
@@ -30,7 +30,7 @@ SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 audit babeltrace big-endian bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
REQUIRED_USE="
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2024-03-10 20:00 Arthur Zamarin
0 siblings, 0 replies; 141+ messages in thread
From: Arthur Zamarin @ 2024-03-10 20:00 UTC (permalink / raw
To: gentoo-commits
commit: 025ac59853fd605d98b0d1db90a3344344072c87
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 10 20:00:30 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 20:00:30 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=025ac598
dev-util/perf: Stabilize 6.7 ppc64, #916522
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-util/perf/perf-6.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-6.7.ebuild b/dev-util/perf/perf-6.7.ebuild
index d16e08bca563..531470248dbd 100644
--- a/dev-util/perf/perf-6.7.ebuild
+++ b/dev-util/perf/perf-6.7.ebuild
@@ -30,7 +30,7 @@ SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 audit babeltrace big-endian bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
REQUIRED_USE="
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2024-03-10 22:54 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2024-03-10 22:54 UTC (permalink / raw
To: gentoo-commits
commit: dc3e8b2f29b50bef2b793452cdc5cbef6b8f83a2
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 10 22:08:36 2024 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 22:54:32 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc3e8b2f
dev-util/perf: move ${S} to the right place
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/perf-6.3.ebuild | 6 +++---
dev-util/perf/perf-6.7.ebuild | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dev-util/perf/perf-6.3.ebuild b/dev-util/perf/perf-6.3.ebuild
index a441b1091d01..80e9fe676047 100644
--- a/dev-util/perf/perf-6.3.ebuild
+++ b/dev-util/perf/perf-6.3.ebuild
@@ -28,6 +28,9 @@ fi
LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
@@ -79,9 +82,6 @@ DEPEND="${RDEPEND}
java? ( virtual/jdk )
"
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
QA_FLAGS_IGNORED=(
diff --git a/dev-util/perf/perf-6.7.ebuild b/dev-util/perf/perf-6.7.ebuild
index 1c017c7af180..59b57c8f015a 100644
--- a/dev-util/perf/perf-6.7.ebuild
+++ b/dev-util/perf/perf-6.7.ebuild
@@ -28,6 +28,9 @@ fi
LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
@@ -92,9 +95,6 @@ DEPEND="${RDEPEND}
java? ( virtual/jdk )
"
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
QA_FLAGS_IGNORED=(
'usr/bin/perf-read-vdso32' # not linked with anything except for libc
'usr/libexec/perf-core/dlfilters/.*' # plugins
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2024-03-10 22:54 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2024-03-10 22:54 UTC (permalink / raw
To: gentoo-commits
commit: 45d6a9ae1e055079276ae61463ae0221a6fdacf0
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 10 22:11:52 2024 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 22:54:32 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45d6a9ae
dev-util/perf: add 6.8
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/Manifest | 1 +
dev-util/perf/perf-6.8.ebuild | 338 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 339 insertions(+)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 6d3f98bf72ae..d0961af9f392 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,2 +1,3 @@
DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
DIST linux-6.7.tar.xz 141406528 BLAKE2B cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e SHA512 de06de556191614bd9daf077ae239360352a402bab407748e67f1e5108c92fd933e451707840ab22fe0f9976db3d1e1b60ca9d41cf894f015ca09b3f652b74ad
+DIST linux-6.8.tar.xz 142502100 BLAKE2B c6f17f816cea16e629f63e9379b98888713f57b2c5173306926471f139a9d612a0c74e119341f8075390e55e203d787d9edeb4ad5a064b18870f6f0f7ffaafb2 SHA512 5c4eb4aa1d3f7d1ea01c0f7ddeadacdece6e144fd4bdfc16b2b925d3e10dc04de3a6db69320b79a96c3560052616f001d2c09e7a1bb4f7b731e2380a7ecce068
diff --git a/dev-util/perf/perf-6.8.ebuild b/dev-util/perf/perf-6.8.ebuild
new file mode 100644
index 000000000000..71d7382d4545
--- /dev/null
+++ b/dev-util/perf/perf-6.8.ebuild
@@ -0,0 +1,338 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit bash-completion-r1 estack flag-o-matic linux-info llvm toolchain-funcs python-r1
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+ LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+ PATCH_VERSION=$(ver_cut 1-3)
+ LINUX_PATCH=patch-${PV//_/-}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+ https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ ${PV} == *.*.* ]] ; then
+ # stable-release series
+ LINUX_VER=$(ver_cut 1-2)
+ LINUX_PATCH=patch-${PV}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+ LINUX_VER=${PV}
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 audit babeltrace big-endian bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+"
+
+# setuptools (and Python) are always needed even if not building Python bindings
+BDEPEND="
+ ${LINUX_PATCH+dev-util/patchutils}
+ ${PYTHON_DEPS}
+ >=app-arch/tar-1.34-r2
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ app-alternatives/yacc
+ app-alternatives/lex
+ virtual/pkgconfig
+ doc? (
+ app-text/asciidoc
+ app-text/sgml-common
+ app-text/xmlto
+ sys-process/time
+ )
+"
+
+RDEPEND="
+ audit? ( sys-process/audit )
+ babeltrace? ( dev-util/babeltrace:0/1 )
+ bpf? (
+ dev-libs/libbpf
+ dev-util/bpftool
+ dev-util/pahole
+ )
+ caps? ( sys-libs/libcap )
+ bpf? (
+ sys-devel/clang:=
+ sys-devel/llvm:=
+ )
+ crypt? ( dev-libs/openssl:= )
+ gtk? ( x11-libs/gtk+:2 )
+ java? ( virtual/jre:* )
+ libpfm? ( dev-libs/libpfm:= )
+ libtraceevent? ( dev-libs/libtraceevent )
+ libtracefs? ( dev-libs/libtracefs )
+ lzma? ( app-arch/xz-utils )
+ numa? ( sys-process/numactl )
+ perl? ( dev-lang/perl:= )
+ python? ( ${PYTHON_DEPS} )
+ slang? ( sys-libs/slang )
+ systemtap? ( dev-debug/systemtap )
+ tcmalloc? ( dev-util/google-perftools )
+ unwind? ( sys-libs/libunwind:= )
+ zstd? ( app-arch/zstd:= )
+ dev-libs/elfutils
+ sys-libs/binutils-libs:=
+ sys-libs/zlib
+ virtual/libcrypt
+"
+
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-5.10
+ java? ( virtual/jdk )
+"
+
+QA_FLAGS_IGNORED=(
+ 'usr/bin/perf-read-vdso32' # not linked with anything except for libc
+ 'usr/libexec/perf-core/dlfilters/.*' # plugins
+)
+
+pkg_pretend() {
+ if ! use doc ; then
+ ewarn "Without the doc USE flag you won't get any documentation nor man pages."
+ ewarn "And without man pages, you won't get any --help output for perf and its"
+ ewarn "sub-tools."
+ fi
+}
+
+pkg_setup() {
+ local CONFIG_CHECK="
+ ~DEBUG_INFO
+ ~FTRACE
+ ~FTRACE_SYSCALLS
+ ~FUNCTION_TRACER
+ ~KALLSYMS
+ ~KALLSYMS_ALL
+ ~KPROBES
+ ~KPROBE_EVENTS
+ ~PERF_EVENTS
+ ~UPROBES
+ ~UPROBE_EVENTS
+ "
+
+ use bpf && llvm_pkg_setup
+ # We enable python unconditionally as libbpf always generates
+ # API headers using python script
+ python_setup
+
+ if use bpf ; then
+ CONFIG_CHECK+="~BPF ~BPF_EVENTS ~BPF_SYSCALL ~DEBUG_INFO_BTF ~HAVE_EBPF_JIT"
+ fi
+
+ linux-info_pkg_setup
+}
+
+# src_unpack and src_prepare are copied to dev-util/bpftool since
+# it's building from the same tarball, please keep it in sync with bpftool
+src_unpack() {
+ local paths=(
+ kernel/bpf tools/{arch,bpf,build,include,lib,perf,scripts}
+ scripts include lib "arch/*/lib" "arch/*/tools"
+ )
+
+ # We expect the tar implementation to support the -j option (both
+ # GNU tar and libarchive's tar support that).
+ echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+ gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+ "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ eshopts_push -o noglob
+ ebegin "Filtering partial source patch"
+ filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+ > ${P}.patch
+ eend $? || die "filterdiff failed"
+ eshopts_pop
+ fi
+
+ local a
+ for a in ${A}; do
+ [[ ${a} == ${LINUX_SOURCES} ]] && continue
+ [[ ${a} == ${LINUX_PATCH} ]] && continue
+ unpack ${a}
+ done
+}
+
+src_prepare() {
+ default
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ pushd "${S_K}" >/dev/null || die
+ eapply "${WORKDIR}"/${P}.patch
+ popd || die
+ fi
+
+ pushd "${S_K}" >/dev/null || die
+ eapply "${FILESDIR}"/perf-6.4-libtracefs.patch
+ eapply "${FILESDIR}"/perf-6.7-expr.patch
+ popd || die
+
+ # 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 \
+ "${S_K}"/tools/lib/perf/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' {} +
+}
+
+puse() { usex $1 "" 1; }
+perf_make() {
+ # The arch parsing is a bit funky. The perf tools package is integrated
+ # into the kernel, so it wants an ARCH that looks like the kernel arch,
+ # but it also wants to know about the split value -- i386/x86_64 vs just
+ # x86. We can get that by telling the func to use an older linux version.
+ # It's kind of a hack, but not that bad ...
+
+ # LIBDIR sets a search path of perf-gtk.so. Bug 515954
+
+ local arch=$(tc-arch-kernel)
+ local java_dir
+ use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
+
+ # sync this with the whitelist in tools/perf/Makefile.config
+ local disable_libdw
+ if ! use amd64 && ! use x86 && \
+ ! use arm && \
+ ! use arm64 && \
+ ! use ppc && ! use ppc64 \
+ ! use s390 && \
+ ! use riscv && \
+ ! use loong
+ then
+ disable_libdw=1
+ fi
+
+ # perf directly invokes LD for linking without going through CC, on mips
+ # it is required to specify the emulation. port of below buildroot patch
+ # https://patchwork.ozlabs.org/project/buildroot/patch/20170217105905.32151-1-Vincent.Riera@imgtec.com/
+ local linker="$(tc-getLD)"
+ if use mips
+ then
+ if use big-endian
+ then
+ use abi_mips_n64 && linker+=" -m elf64btsmip"
+ use abi_mips_n32 && linker+=" -m elf32btsmipn32"
+ use abi_mips_o32 && linker+=" -m elf32btsmip"
+ else
+ use abi_mips_n64 && linker+=" -m elf64ltsmip"
+ use abi_mips_n32 && linker+=" -m elf32ltsmipn32"
+ use abi_mips_o32 && linker+=" -m elf32ltsmip"
+ fi
+ fi
+
+ # FIXME: NO_CORESIGHT
+ local emakeargs=(
+ V=1 VF=1
+ HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)"
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="${linker}" NM="$(tc-getNM)"
+ PKG_CONFIG="$(tc-getPKG_CONFIG)"
+ prefix="${EPREFIX}/usr" bindir_relative="bin"
+ tipdir="share/doc/${PF}"
+ EXTRA_CFLAGS="${CFLAGS}"
+ EXTRA_LDFLAGS="${LDFLAGS}"
+ ARCH="${arch}"
+ BUILD_BPF_SKEL=$(usex bpf 1 "") \
+ BUILD_NONDISTRO=1
+ JDIR="${java_dir}"
+ CORESIGHT=
+ GTK2=$(usex gtk 1 "")
+ feature-gtk2-infobar=$(usex gtk 1 "")
+ NO_AUXTRACE=
+ NO_BACKTRACE=
+ NO_DEMANGLE=
+ NO_JEVENTS=$(puse python)
+ NO_JVMTI=$(puse java)
+ NO_LIBAUDIT=$(puse audit)
+ NO_LIBBABELTRACE=$(puse babeltrace)
+ NO_LIBBIONIC=1
+ NO_LIBBPF=$(puse bpf)
+ NO_LIBCAP=$(puse caps)
+ NO_LIBCRYPTO=$(puse crypt)
+ NO_LIBDW_DWARF_UNWIND="${disable_libdw}"
+ NO_LIBELF=
+ NO_LIBNUMA=$(puse numa)
+ NO_LIBPERL=$(puse perl)
+ NO_LIBPFM4=$(puse libpfm)
+ NO_LIBPYTHON=$(puse python)
+ NO_LIBTRACEEVENT=$(puse libtraceevent)
+ NO_LIBUNWIND=$(puse unwind)
+ NO_LIBZSTD=$(puse zstd)
+ NO_SDT=$(puse systemtap)
+ NO_SLANG=$(puse slang)
+ NO_LZMA=$(puse lzma)
+ NO_ZLIB=
+ TCMALLOC=$(usex tcmalloc 1 "")
+ WERROR=0
+ LIBDIR="/usr/libexec/perf-core"
+ libdir="${EPREFIX}/usr/$(get_libdir)"
+ plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins"
+ "$@"
+ )
+ emake "${emakeargs[@]}"
+}
+
+src_compile() {
+ filter-lto
+
+ perf_make -f Makefile.perf
+ use doc && perf_make -C Documentation man
+}
+
+src_test() {
+ :
+}
+
+src_install() {
+ _install_python_ext() {
+ perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
+ }
+
+ perf_make -f Makefile.perf install DESTDIR="${D}"
+
+ if use python; then
+ python_foreach_impl _install_python_ext
+ fi
+
+ if use gtk; then
+ local libdir
+ libdir="$(get_libdir)"
+ # on some arches it ends up in lib even on 64bit, ppc64 for instance.
+ [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
+ mv "${ED}"/usr/${libdir}/libperf-gtk.so \
+ "${ED}"/usr/libexec/perf-core || die
+ fi
+
+ dodoc CREDITS
+
+ dodoc *txt Documentation/*.txt
+
+ # perf needs this decompressed to print out tips for users
+ docompress -x /usr/share/doc/${PF}/tips.txt
+
+ if use doc ; then
+ doman Documentation/*.1
+ fi
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2024-03-10 22:54 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2024-03-10 22:54 UTC (permalink / raw
To: gentoo-commits
commit: a124aad19ed3bce269f05aef3fc17406c2fcb6c9
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 10 22:11:04 2024 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 22:54:32 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a124aad1
dev-util/perf: drop 6.5, 6.6
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/Manifest | 2 -
dev-util/perf/perf-6.5.ebuild | 326 ----------------------------------------
dev-util/perf/perf-6.6.ebuild | 337 ------------------------------------------
3 files changed, 665 deletions(-)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 0ceb4c677bbe..6d3f98bf72ae 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,4 +1,2 @@
DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
-DIST linux-6.5.tar.xz 138898084 BLAKE2B 2e641b79a080e8f4ce283bcf6b74e2c6f15a374367f1c4c875c663868dbe801317340824fb3adb46b3a51d3b7e1f67cc4e8144d367621ec43ffba5c4eb8abb39 SHA512 1b59dc5e65d4922c3217a8c8f19022dfd6595ae89747861d825bfeb51a4ae6c85449d05db69635a712bef7b355b80318195665582d8933b1fed6ba582f6ff257
-DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
DIST linux-6.7.tar.xz 141406528 BLAKE2B cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e SHA512 de06de556191614bd9daf077ae239360352a402bab407748e67f1e5108c92fd933e451707840ab22fe0f9976db3d1e1b60ca9d41cf894f015ca09b3f652b74ad
diff --git a/dev-util/perf/perf-6.5.ebuild b/dev-util/perf/perf-6.5.ebuild
deleted file mode 100644
index 31d57afa8da7..000000000000
--- a/dev-util/perf/perf-6.5.ebuild
+++ /dev/null
@@ -1,326 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit bash-completion-r1 estack flag-o-matic linux-info llvm toolchain-funcs python-r1
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
- LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
- PATCH_VERSION=$(ver_cut 1-3)
- LINUX_PATCH=patch-${PV//_/-}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
- https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ ${PV} == *.*.* ]] ; then
- # stable-release series
- LINUX_VER=$(ver_cut 1-2)
- LINUX_PATCH=patch-${PV}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
- LINUX_VER=${PV}
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit babeltrace bpf caps clang crypt debug +doc gtk java libpfm libtraceevent libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
-
-REQUIRED_USE="
- bpf? ( clang )
- ${PYTHON_REQUIRED_USE}
-"
-
-# setuptools (and Python) are always needed even if not building Python bindings
-BDEPEND="
- ${LINUX_PATCH+dev-util/patchutils}
- ${PYTHON_DEPS}
- >=app-arch/tar-1.34-r2
- dev-python/setuptools[${PYTHON_USEDEP}]
- app-alternatives/yacc
- app-alternatives/lex
- virtual/pkgconfig
- doc? (
- app-text/asciidoc
- app-text/sgml-common
- app-text/xmlto
- sys-process/time
- )
-"
-
-RDEPEND="
- audit? ( sys-process/audit )
- babeltrace? ( dev-util/babeltrace )
- bpf? (
- dev-libs/libbpf
- dev-util/bpftool
- dev-util/pahole
- )
- caps? ( sys-libs/libcap )
- clang? (
- sys-devel/clang:=
- sys-devel/llvm:=
- )
- crypt? ( dev-libs/openssl:= )
- gtk? ( x11-libs/gtk+:2 )
- java? ( virtual/jre:* )
- libpfm? ( dev-libs/libpfm:= )
- libtraceevent? ( dev-libs/libtraceevent )
- libtracefs? ( dev-libs/libtracefs )
- lzma? ( app-arch/xz-utils )
- numa? ( sys-process/numactl )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- slang? ( sys-libs/slang )
- systemtap? ( dev-debug/systemtap )
- tcmalloc? ( dev-util/google-perftools )
- unwind? ( sys-libs/libunwind:= )
- zstd? ( app-arch/zstd:= )
- dev-libs/elfutils
- sys-libs/binutils-libs:=
- sys-libs/zlib
-"
-
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-5.10
- java? ( virtual/jdk )
-"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
-CONFIG_CHECK="
- ~DEBUG_INFO
- ~FTRACE
- ~FTRACE_SYSCALLS
- ~FUNCTION_TRACER
- ~KALLSYMS
- ~KALLSYMS_ALL
- ~KPROBES
- ~KPROBE_EVENTS
- ~PERF_EVENTS
- ~UPROBES
- ~UPROBE_EVENTS
-"
-
-QA_FLAGS_IGNORED=(
- 'usr/bin/perf-read-vdso32' # not linked with anything except for libc
- 'usr/libexec/perf-core/dlfilters/.*' # plugins
-)
-
-pkg_pretend() {
- if ! use doc ; then
- ewarn "Without the doc USE flag you won't get any documentation nor man pages."
- ewarn "And without man pages, you won't get any --help output for perf and its"
- ewarn "sub-tools."
- fi
-}
-
-pkg_setup() {
- use clang && llvm_pkg_setup
- # We enable python unconditionally as libbpf always generates
- # API headers using python script
- python_setup
-
- if use bpf ; then
- CONFIG_CHECK+="~BPF ~BPF_EVENTS ~BPF_SYSCALL ~DEBUG_INFO_BTF ~HAVE_EBPF_JIT"
- fi
-
- linux-info_pkg_setup
-}
-
-# src_unpack and src_prepare are copied to dev-util/bpftool since
-# it's building from the same tarball, please keep it in sync with bpftool
-src_unpack() {
- local paths=(
- kernel/bpf tools/{arch,bpf,build,include,lib,perf,scripts}
- scripts include lib "arch/*/lib"
- )
-
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
- > ${P}.patch
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- done
-}
-
-src_prepare() {
- default
- if [[ -n ${LINUX_PATCH} ]] ; then
- pushd "${S_K}" >/dev/null || die
- eapply "${WORKDIR}"/${P}.patch
- popd || die
- fi
-
- pushd "${S_K}" >/dev/null || die
- eapply "${FILESDIR}"/perf-6.0-clang.patch
- eapply "${FILESDIR}"/perf-6.0-c++17.patch
- eapply "${FILESDIR}"/perf-6.4-libtracefs.patch
- popd || die
-
- # 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 \
- "${S_K}"/tools/lib/perf/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' {} +
-}
-
-puse() { usex $1 "" 1; }
-perf_make() {
- # The arch parsing is a bit funky. The perf tools package is integrated
- # into the kernel, so it wants an ARCH that looks like the kernel arch,
- # but it also wants to know about the split value -- i386/x86_64 vs just
- # x86. We can get that by telling the func to use an older linux version.
- # It's kind of a hack, but not that bad ...
-
- # LIBDIR sets a search path of perf-gtk.so. Bug 515954
-
- local arch=$(tc-arch-kernel)
- local java_dir
- use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
-
- # sync this with the whitelist in tools/perf/Makefile.config
- local disable_libdw
- if ! use amd64 && ! use x86 && \
- ! use arm && \
- ! use arm64 && \
- ! use ppc && ! use ppc64 \
- ! use s390 && \
- ! use riscv && \
- ! use loong
- then
- disable_libdw=1
- fi
-
- # FIXME: NO_CORESIGHT
- local emakeargs=(
- 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)"
- PKG_CONFIG="$(tc-getPKG_CONFIG)"
- prefix="${EPREFIX}/usr" bindir_relative="bin"
- tipdir="share/doc/${PF}"
- EXTRA_CFLAGS="${CFLAGS}"
- EXTRA_LDFLAGS="${LDFLAGS}"
- ARCH="${arch}"
- BUILD_BPF_SKEL=$(usex bpf 1 "") \
- BUILD_NONDISTRO=1
- JDIR="${java_dir}"
- CORESIGHT=
- GTK2=$(usex gtk 1 "")
- LIBCLANGLLVM=$(usex clang 1 "")
- feature-gtk2-infobar=$(usex gtk 1 "")
- NO_AUXTRACE=
- NO_BACKTRACE=
- NO_DEMANGLE=
- NO_JEVENTS=$(puse python)
- NO_JVMTI=$(puse java)
- NO_LIBAUDIT=$(puse audit)
- NO_LIBBABELTRACE=$(puse babeltrace)
- NO_LIBBIONIC=1
- NO_LIBBPF=$(puse bpf)
- NO_LIBCAP=$(puse caps)
- NO_LIBCRYPTO=$(puse crypt)
- NO_LIBDW_DWARF_UNWIND="${disable_libdw}"
- NO_LIBELF=
- NO_LIBNUMA=$(puse numa)
- NO_LIBPERL=$(puse perl)
- NO_LIBPFM4=$(puse libpfm)
- NO_LIBPYTHON=$(puse python)
- NO_LIBTRACEEVENT=$(puse libtraceevent)
- NO_LIBUNWIND=$(puse unwind)
- NO_LIBZSTD=$(puse zstd)
- NO_SDT=$(puse systemtap)
- NO_SLANG=$(puse slang)
- NO_LZMA=$(puse lzma)
- NO_ZLIB=
- TCMALLOC=$(usex tcmalloc 1 "")
- WERROR=0
- LIBDIR="/usr/libexec/perf-core"
- libdir="${EPREFIX}/usr/$(get_libdir)"
- plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins"
- "$@"
- )
- emake "${emakeargs[@]}"
-}
-
-src_compile() {
- filter-lto
-
- # test-clang.bin not build with g++
- if use clang; then
- make -C "${S_K}/tools/build/feature" V=1 CXX=${CHOST}-clang++ test-clang.bin || die
- fi
- perf_make -f Makefile.perf
- use doc && perf_make -C Documentation man
-}
-
-src_test() {
- :
-}
-
-src_install() {
- _install_python_ext() {
- perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
- }
-
- perf_make -f Makefile.perf install DESTDIR="${D}"
-
- if use python; then
- python_foreach_impl _install_python_ext
- fi
-
- if use gtk; then
- local libdir
- libdir="$(get_libdir)"
- # on some arches it ends up in lib even on 64bit, ppc64 for instance.
- [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
- mv "${ED}"/usr/${libdir}/libperf-gtk.so \
- "${ED}"/usr/libexec/perf-core || die
- fi
-
- dodoc CREDITS
-
- dodoc *txt Documentation/*.txt
-
- # perf needs this decompressed to print out tips for users
- docompress -x /usr/share/doc/${PF}/tips.txt
-
- if use doc ; then
- doman Documentation/*.1
- fi
-}
diff --git a/dev-util/perf/perf-6.6.ebuild b/dev-util/perf/perf-6.6.ebuild
deleted file mode 100644
index 6436d68b9705..000000000000
--- a/dev-util/perf/perf-6.6.ebuild
+++ /dev/null
@@ -1,337 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit bash-completion-r1 estack flag-o-matic linux-info llvm toolchain-funcs python-r1
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
- LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
- PATCH_VERSION=$(ver_cut 1-3)
- LINUX_PATCH=patch-${PV//_/-}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
- https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ ${PV} == *.*.* ]] ; then
- # stable-release series
- LINUX_VER=$(ver_cut 1-2)
- LINUX_PATCH=patch-${PV}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
- LINUX_VER=${PV}
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 audit babeltrace big-endian bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
-"
-
-# setuptools (and Python) are always needed even if not building Python bindings
-BDEPEND="
- ${LINUX_PATCH+dev-util/patchutils}
- ${PYTHON_DEPS}
- >=app-arch/tar-1.34-r2
- dev-python/setuptools[${PYTHON_USEDEP}]
- app-alternatives/yacc
- app-alternatives/lex
- virtual/pkgconfig
- doc? (
- app-text/asciidoc
- app-text/sgml-common
- app-text/xmlto
- sys-process/time
- )
-"
-
-RDEPEND="
- audit? ( sys-process/audit )
- babeltrace? ( dev-util/babeltrace )
- bpf? (
- dev-libs/libbpf
- dev-util/bpftool
- dev-util/pahole
- )
- caps? ( sys-libs/libcap )
- bpf? (
- sys-devel/clang:=
- sys-devel/llvm:=
- )
- crypt? ( dev-libs/openssl:= )
- gtk? ( x11-libs/gtk+:2 )
- java? ( virtual/jre:* )
- libpfm? ( dev-libs/libpfm:= )
- libtraceevent? ( dev-libs/libtraceevent )
- libtracefs? ( dev-libs/libtracefs )
- lzma? ( app-arch/xz-utils )
- numa? ( sys-process/numactl )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- slang? ( sys-libs/slang )
- systemtap? ( dev-debug/systemtap )
- tcmalloc? ( dev-util/google-perftools )
- unwind? ( sys-libs/libunwind:= )
- zstd? ( app-arch/zstd:= )
- dev-libs/elfutils
- sys-libs/binutils-libs:=
- sys-libs/zlib
-"
-
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-5.10
- java? ( virtual/jdk )
-"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
-CONFIG_CHECK="
- ~DEBUG_INFO
- ~FTRACE
- ~FTRACE_SYSCALLS
- ~FUNCTION_TRACER
- ~KALLSYMS
- ~KALLSYMS_ALL
- ~KPROBES
- ~KPROBE_EVENTS
- ~PERF_EVENTS
- ~UPROBES
- ~UPROBE_EVENTS
-"
-
-QA_FLAGS_IGNORED=(
- 'usr/bin/perf-read-vdso32' # not linked with anything except for libc
- 'usr/libexec/perf-core/dlfilters/.*' # plugins
-)
-
-pkg_pretend() {
- if ! use doc ; then
- ewarn "Without the doc USE flag you won't get any documentation nor man pages."
- ewarn "And without man pages, you won't get any --help output for perf and its"
- ewarn "sub-tools."
- fi
-}
-
-pkg_setup() {
- use bpf && llvm_pkg_setup
- # We enable python unconditionally as libbpf always generates
- # API headers using python script
- python_setup
-
- if use bpf ; then
- CONFIG_CHECK+="~BPF ~BPF_EVENTS ~BPF_SYSCALL ~DEBUG_INFO_BTF ~HAVE_EBPF_JIT"
- fi
-
- linux-info_pkg_setup
-}
-
-# src_unpack and src_prepare are copied to dev-util/bpftool since
-# it's building from the same tarball, please keep it in sync with bpftool
-src_unpack() {
- local paths=(
- kernel/bpf tools/{arch,bpf,build,include,lib,perf,scripts}
- scripts include lib "arch/*/lib"
- )
-
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
- > ${P}.patch
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- done
-}
-
-src_prepare() {
- default
- if [[ -n ${LINUX_PATCH} ]] ; then
- pushd "${S_K}" >/dev/null || die
- eapply "${WORKDIR}"/${P}.patch
- popd || die
- fi
-
- pushd "${S_K}" >/dev/null || die
- eapply "${FILESDIR}"/perf-6.4-libtracefs.patch
- eapply "${FILESDIR}"/perf-6.6-ia64.patch
- popd || die
-
- # 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 \
- "${S_K}"/tools/lib/perf/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' {} +
-}
-
-puse() { usex $1 "" 1; }
-perf_make() {
- # The arch parsing is a bit funky. The perf tools package is integrated
- # into the kernel, so it wants an ARCH that looks like the kernel arch,
- # but it also wants to know about the split value -- i386/x86_64 vs just
- # x86. We can get that by telling the func to use an older linux version.
- # It's kind of a hack, but not that bad ...
-
- # LIBDIR sets a search path of perf-gtk.so. Bug 515954
-
- local arch=$(tc-arch-kernel)
- local java_dir
- use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
-
- # sync this with the whitelist in tools/perf/Makefile.config
- local disable_libdw
- if ! use amd64 && ! use x86 && \
- ! use arm && \
- ! use arm64 && \
- ! use ppc && ! use ppc64 \
- ! use s390 && \
- ! use riscv && \
- ! use loong
- then
- disable_libdw=1
- fi
-
- # perf directly invokes LD for linking without going through CC, on mips
- # it is required to specify the emulation. port of below buildroot patch
- # https://patchwork.ozlabs.org/project/buildroot/patch/20170217105905.32151-1-Vincent.Riera@imgtec.com/
- local linker="$(tc-getLD)"
- if use mips
- then
- if use big-endian
- then
- use abi_mips_n64 && linker+=" -m elf64btsmip"
- use abi_mips_n32 && linker+=" -m elf32btsmipn32"
- use abi_mips_o32 && linker+=" -m elf32btsmip"
- else
- use abi_mips_n64 && linker+=" -m elf64ltsmip"
- use abi_mips_n32 && linker+=" -m elf32ltsmipn32"
- use abi_mips_o32 && linker+=" -m elf32ltsmip"
- fi
- fi
-
- # FIXME: NO_CORESIGHT
- local emakeargs=(
- V=1 VF=1
- HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)"
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="${linker}" NM="$(tc-getNM)"
- PKG_CONFIG="$(tc-getPKG_CONFIG)"
- prefix="${EPREFIX}/usr" bindir_relative="bin"
- tipdir="share/doc/${PF}"
- EXTRA_CFLAGS="${CFLAGS}"
- EXTRA_LDFLAGS="${LDFLAGS}"
- ARCH="${arch}"
- BUILD_BPF_SKEL=$(usex bpf 1 "") \
- BUILD_NONDISTRO=1
- JDIR="${java_dir}"
- CORESIGHT=
- GTK2=$(usex gtk 1 "")
- feature-gtk2-infobar=$(usex gtk 1 "")
- NO_AUXTRACE=
- NO_BACKTRACE=
- NO_DEMANGLE=
- NO_JEVENTS=$(puse python)
- NO_JVMTI=$(puse java)
- NO_LIBAUDIT=$(puse audit)
- NO_LIBBABELTRACE=$(puse babeltrace)
- NO_LIBBIONIC=1
- NO_LIBBPF=$(puse bpf)
- NO_LIBCAP=$(puse caps)
- NO_LIBCRYPTO=$(puse crypt)
- NO_LIBDW_DWARF_UNWIND="${disable_libdw}"
- NO_LIBELF=
- NO_LIBNUMA=$(puse numa)
- NO_LIBPERL=$(puse perl)
- NO_LIBPFM4=$(puse libpfm)
- NO_LIBPYTHON=$(puse python)
- NO_LIBTRACEEVENT=$(puse libtraceevent)
- NO_LIBUNWIND=$(puse unwind)
- NO_LIBZSTD=$(puse zstd)
- NO_SDT=$(puse systemtap)
- NO_SLANG=$(puse slang)
- NO_LZMA=$(puse lzma)
- NO_ZLIB=
- TCMALLOC=$(usex tcmalloc 1 "")
- WERROR=0
- LIBDIR="/usr/libexec/perf-core"
- libdir="${EPREFIX}/usr/$(get_libdir)"
- plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins"
- "$@"
- )
- emake "${emakeargs[@]}"
-}
-
-src_compile() {
- filter-lto
-
- perf_make -f Makefile.perf
- use doc && perf_make -C Documentation man
-}
-
-src_test() {
- :
-}
-
-src_install() {
- _install_python_ext() {
- perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
- }
-
- perf_make -f Makefile.perf install DESTDIR="${D}"
-
- if use python; then
- python_foreach_impl _install_python_ext
- fi
-
- if use gtk; then
- local libdir
- libdir="$(get_libdir)"
- # on some arches it ends up in lib even on 64bit, ppc64 for instance.
- [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
- mv "${ED}"/usr/${libdir}/libperf-gtk.so \
- "${ED}"/usr/libexec/perf-core || die
- fi
-
- dodoc CREDITS
-
- dodoc *txt Documentation/*.txt
-
- # perf needs this decompressed to print out tips for users
- docompress -x /usr/share/doc/${PF}/tips.txt
-
- if use doc ; then
- doman Documentation/*.1
- fi
-}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2024-03-10 23:21 Jakov Smolić
0 siblings, 0 replies; 141+ messages in thread
From: Jakov Smolić @ 2024-03-10 23:21 UTC (permalink / raw
To: gentoo-commits
commit: ab050bca35d13b7b87ce778944791af55fa79c0f
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 10 23:21:39 2024 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 23:21:39 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab050bca
dev-util/perf: Stabilize 6.7 arm, #916522
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
dev-util/perf/perf-6.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-6.7.ebuild b/dev-util/perf/perf-6.7.ebuild
index 59b57c8f015a..d261f3170eca 100644
--- a/dev-util/perf/perf-6.7.ebuild
+++ b/dev-util/perf/perf-6.7.ebuild
@@ -33,7 +33,7 @@ S="${S_K}/tools/perf"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~loong ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 audit babeltrace big-endian bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
REQUIRED_USE="
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2024-03-13 4:48 Sam James
0 siblings, 0 replies; 141+ messages in thread
From: Sam James @ 2024-03-13 4:48 UTC (permalink / raw
To: gentoo-commits
commit: b3bf58668cd0c3f047d653074218c036ced7bd6d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 13 04:47:50 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 13 04:47:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3bf5866
dev-util/perf: Stabilize 6.7 arm64, #916522
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/perf/perf-6.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-6.7.ebuild b/dev-util/perf/perf-6.7.ebuild
index d261f3170eca..5d0dd06b320d 100644
--- a/dev-util/perf/perf-6.7.ebuild
+++ b/dev-util/perf/perf-6.7.ebuild
@@ -33,7 +33,7 @@ S="${S_K}/tools/perf"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~loong ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 audit babeltrace big-endian bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
REQUIRED_USE="
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2024-05-24 15:38 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2024-05-24 15:38 UTC (permalink / raw
To: gentoo-commits
commit: 71857968fa0453e89365b637d35c6ba6ea2970e1
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Fri May 24 15:31:32 2024 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Fri May 24 15:38:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71857968
dev-util/perf: version bump to 6.9
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/Manifest | 1 +
dev-util/perf/perf-6.9.ebuild | 339 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 340 insertions(+)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index d0961af9f392..38c4e09db5b7 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,3 +1,4 @@
DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
DIST linux-6.7.tar.xz 141406528 BLAKE2B cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e SHA512 de06de556191614bd9daf077ae239360352a402bab407748e67f1e5108c92fd933e451707840ab22fe0f9976db3d1e1b60ca9d41cf894f015ca09b3f652b74ad
DIST linux-6.8.tar.xz 142502100 BLAKE2B c6f17f816cea16e629f63e9379b98888713f57b2c5173306926471f139a9d612a0c74e119341f8075390e55e203d787d9edeb4ad5a064b18870f6f0f7ffaafb2 SHA512 5c4eb4aa1d3f7d1ea01c0f7ddeadacdece6e144fd4bdfc16b2b925d3e10dc04de3a6db69320b79a96c3560052616f001d2c09e7a1bb4f7b731e2380a7ecce068
+DIST linux-6.9.tar.xz 144034416 BLAKE2B 4cf86c3cfe6e6534745d42dfaeca59b17ea1168c4e8b615c80e6d8aac735f11283cd85fa992b440b5d4452917e94b9f08397a64af0be5894e3df23c68892377e SHA512 fed3b4cd1fbfb4d94618587c1934273d2ecc8b6e42a3d586ff8a5f24980be930f2ef803aa2923ca3bfa5e4e619f967f3af315368f24fa76f610b10443624a579
diff --git a/dev-util/perf/perf-6.9.ebuild b/dev-util/perf/perf-6.9.ebuild
new file mode 100644
index 000000000000..c93e19c6c517
--- /dev/null
+++ b/dev-util/perf/perf-6.9.ebuild
@@ -0,0 +1,339 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit bash-completion-r1 estack flag-o-matic linux-info llvm toolchain-funcs python-r1
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+ LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+ PATCH_VERSION=$(ver_cut 1-3)
+ LINUX_PATCH=patch-${PV//_/-}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+ https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ ${PV} == *.*.* ]] ; then
+ # stable-release series
+ LINUX_VER=$(ver_cut 1-2)
+ LINUX_PATCH=patch-${PV}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+ LINUX_VER=${PV}
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 audit babeltrace capstone big-endian bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+"
+
+# setuptools (and Python) are always needed even if not building Python bindings
+BDEPEND="
+ ${LINUX_PATCH+dev-util/patchutils}
+ ${PYTHON_DEPS}
+ >=app-arch/tar-1.34-r2
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ app-alternatives/yacc
+ app-alternatives/lex
+ virtual/pkgconfig
+ doc? (
+ app-text/asciidoc
+ app-text/sgml-common
+ app-text/xmlto
+ sys-process/time
+ )
+"
+
+RDEPEND="
+ audit? ( sys-process/audit )
+ babeltrace? ( dev-util/babeltrace:0/1 )
+ bpf? (
+ dev-libs/libbpf
+ dev-util/bpftool
+ dev-util/pahole
+ sys-devel/clang:=
+ sys-devel/llvm:=
+ )
+ caps? ( sys-libs/libcap )
+ capstone? ( dev-libs/capstone )
+ crypt? ( dev-libs/openssl:= )
+ gtk? ( x11-libs/gtk+:2 )
+ java? ( virtual/jre:* )
+ libpfm? ( dev-libs/libpfm:= )
+ libtraceevent? ( dev-libs/libtraceevent )
+ libtracefs? ( dev-libs/libtracefs )
+ lzma? ( app-arch/xz-utils )
+ numa? ( sys-process/numactl )
+ perl? ( dev-lang/perl:= )
+ python? ( ${PYTHON_DEPS} )
+ slang? ( sys-libs/slang )
+ systemtap? ( dev-debug/systemtap )
+ tcmalloc? ( dev-util/google-perftools )
+ unwind? ( sys-libs/libunwind:= )
+ zstd? ( app-arch/zstd:= )
+ dev-libs/elfutils
+ sys-libs/binutils-libs:=
+ sys-libs/zlib
+ virtual/libcrypt
+"
+
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-5.10
+ java? ( virtual/jdk )
+"
+
+QA_FLAGS_IGNORED=(
+ 'usr/bin/perf-read-vdso32' # not linked with anything except for libc
+ 'usr/libexec/perf-core/dlfilters/.*' # plugins
+)
+
+pkg_pretend() {
+ if ! use doc ; then
+ ewarn "Without the doc USE flag you won't get any documentation nor man pages."
+ ewarn "And without man pages, you won't get any --help output for perf and its"
+ ewarn "sub-tools."
+ fi
+}
+
+pkg_setup() {
+ local CONFIG_CHECK="
+ ~DEBUG_INFO
+ ~FTRACE
+ ~FTRACE_SYSCALLS
+ ~FUNCTION_TRACER
+ ~KALLSYMS
+ ~KALLSYMS_ALL
+ ~KPROBES
+ ~KPROBE_EVENTS
+ ~PERF_EVENTS
+ ~UPROBES
+ ~UPROBE_EVENTS
+ "
+
+ use bpf && llvm_pkg_setup
+ # We enable python unconditionally as libbpf always generates
+ # API headers using python script
+ python_setup
+
+ if use bpf ; then
+ CONFIG_CHECK+="~BPF ~BPF_EVENTS ~BPF_SYSCALL ~DEBUG_INFO_BTF ~HAVE_EBPF_JIT"
+ fi
+
+ linux-info_pkg_setup
+}
+
+# src_unpack and src_prepare are copied to dev-util/bpftool since
+# it's building from the same tarball, please keep it in sync with bpftool
+src_unpack() {
+ local paths=(
+ kernel/bpf tools/{arch,bpf,build,include,lib,perf,scripts}
+ scripts include lib "arch/*/lib" "arch/*/tools"
+ )
+
+ # We expect the tar implementation to support the -j option (both
+ # GNU tar and libarchive's tar support that).
+ echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+ gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+ "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ eshopts_push -o noglob
+ ebegin "Filtering partial source patch"
+ filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+ > ${P}.patch
+ eend $? || die "filterdiff failed"
+ eshopts_pop
+ fi
+
+ local a
+ for a in ${A}; do
+ [[ ${a} == ${LINUX_SOURCES} ]] && continue
+ [[ ${a} == ${LINUX_PATCH} ]] && continue
+ unpack ${a}
+ done
+}
+
+src_prepare() {
+ default
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ pushd "${S_K}" >/dev/null || die
+ eapply "${WORKDIR}"/${P}.patch
+ popd || die
+ fi
+
+ pushd "${S_K}" >/dev/null || die
+ eapply "${FILESDIR}"/perf-6.4-libtracefs.patch
+ eapply "${FILESDIR}"/perf-6.7-expr.patch
+ popd || die
+
+ # 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 \
+ "${S_K}"/tools/lib/perf/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' {} +
+}
+
+puse() { usex $1 "" 1; }
+perf_make() {
+ # The arch parsing is a bit funky. The perf tools package is integrated
+ # into the kernel, so it wants an ARCH that looks like the kernel arch,
+ # but it also wants to know about the split value -- i386/x86_64 vs just
+ # x86. We can get that by telling the func to use an older linux version.
+ # It's kind of a hack, but not that bad ...
+
+ # LIBDIR sets a search path of perf-gtk.so. Bug 515954
+
+ local arch=$(tc-arch-kernel)
+ local java_dir
+ use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
+
+ # sync this with the whitelist in tools/perf/Makefile.config
+ local disable_libdw
+ if ! use amd64 && ! use x86 && \
+ ! use arm && \
+ ! use arm64 && \
+ ! use ppc && ! use ppc64 \
+ ! use s390 && \
+ ! use riscv && \
+ ! use loong
+ then
+ disable_libdw=1
+ fi
+
+ # perf directly invokes LD for linking without going through CC, on mips
+ # it is required to specify the emulation. port of below buildroot patch
+ # https://patchwork.ozlabs.org/project/buildroot/patch/20170217105905.32151-1-Vincent.Riera@imgtec.com/
+ local linker="$(tc-getLD)"
+ if use mips
+ then
+ if use big-endian
+ then
+ use abi_mips_n64 && linker+=" -m elf64btsmip"
+ use abi_mips_n32 && linker+=" -m elf32btsmipn32"
+ use abi_mips_o32 && linker+=" -m elf32btsmip"
+ else
+ use abi_mips_n64 && linker+=" -m elf64ltsmip"
+ use abi_mips_n32 && linker+=" -m elf32ltsmipn32"
+ use abi_mips_o32 && linker+=" -m elf32ltsmip"
+ fi
+ fi
+
+ # FIXME: NO_CORESIGHT
+ local emakeargs=(
+ V=1 VF=1
+ HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)"
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="${linker}" NM="$(tc-getNM)"
+ PKG_CONFIG="$(tc-getPKG_CONFIG)"
+ prefix="${EPREFIX}/usr" bindir_relative="bin"
+ tipdir="share/doc/${PF}"
+ EXTRA_CFLAGS="${CFLAGS}"
+ EXTRA_LDFLAGS="${LDFLAGS}"
+ ARCH="${arch}"
+ BUILD_BPF_SKEL=$(usex bpf 1 "") \
+ BUILD_NONDISTRO=1
+ JDIR="${java_dir}"
+ CORESIGHT=
+ GTK2=$(usex gtk 1 "")
+ feature-gtk2-infobar=$(usex gtk 1 "")
+ NO_AUXTRACE=
+ NO_BACKTRACE=
+ NO_CAPSTONE=$(puse capstone)
+ NO_DEMANGLE=
+ NO_JEVENTS=$(puse python)
+ NO_JVMTI=$(puse java)
+ NO_LIBAUDIT=$(puse audit)
+ NO_LIBBABELTRACE=$(puse babeltrace)
+ NO_LIBBIONIC=1
+ NO_LIBBPF=$(puse bpf)
+ NO_LIBCAP=$(puse caps)
+ NO_LIBCRYPTO=$(puse crypt)
+ NO_LIBDW_DWARF_UNWIND="${disable_libdw}"
+ NO_LIBELF=
+ NO_LIBNUMA=$(puse numa)
+ NO_LIBPERL=$(puse perl)
+ NO_LIBPFM4=$(puse libpfm)
+ NO_LIBPYTHON=$(puse python)
+ NO_LIBTRACEEVENT=$(puse libtraceevent)
+ NO_LIBUNWIND=$(puse unwind)
+ NO_LIBZSTD=$(puse zstd)
+ NO_SDT=$(puse systemtap)
+ NO_SHELLCHECK=1
+ NO_SLANG=$(puse slang)
+ NO_LZMA=$(puse lzma)
+ NO_ZLIB=
+ TCMALLOC=$(usex tcmalloc 1 "")
+ WERROR=0
+ LIBDIR="/usr/libexec/perf-core"
+ libdir="${EPREFIX}/usr/$(get_libdir)"
+ plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins"
+ "$@"
+ )
+ emake "${emakeargs[@]}"
+}
+
+src_compile() {
+ filter-lto
+
+ perf_make -f Makefile.perf
+ use doc && perf_make -C Documentation man
+}
+
+src_test() {
+ :
+}
+
+src_install() {
+ _install_python_ext() {
+ perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
+ }
+
+ perf_make -f Makefile.perf install DESTDIR="${D}"
+
+ if use python; then
+ python_foreach_impl _install_python_ext
+ fi
+
+ if use gtk; then
+ local libdir
+ libdir="$(get_libdir)"
+ # on some arches it ends up in lib even on 64bit, ppc64 for instance.
+ [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
+ mv "${ED}"/usr/${libdir}/libperf-gtk.so \
+ "${ED}"/usr/libexec/perf-core || die
+ fi
+
+ dodoc CREDITS
+
+ dodoc *txt Documentation/*.txt
+
+ # perf needs this decompressed to print out tips for users
+ docompress -x /usr/share/doc/${PF}/tips.txt
+
+ if use doc ; then
+ doman Documentation/*.1
+ fi
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2024-05-30 14:50 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2024-05-30 14:50 UTC (permalink / raw
To: gentoo-commits
commit: b133fee660bada16b5b6e134ec0d1d3df135c388
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Thu May 30 14:49:05 2024 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Thu May 30 14:49:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b133fee6
dev-util/perf: update metadata.xml with new capstone USE flag
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/metadata.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-util/perf/metadata.xml b/dev-util/perf/metadata.xml
index b249668f8c69..89fef8ad07ac 100644
--- a/dev-util/perf/metadata.xml
+++ b/dev-util/perf/metadata.xml
@@ -16,6 +16,7 @@
<use>
<flag name="bpf">Enable support for eBPF features with <pkg>dev-libs/libbpf</pkg></flag>
<flag name="babeltrace">Enable <pkg>dev-util/babeltrace</pkg> support</flag>
+ <flag name="capstone">Use <pkg>dev-libs/capstone</pkg> for disassembly support</flag>
<flag name="clang">Enable builtin clang and LLVM support</flag>
<flag name="doc">
Build documentation and man pages. With this USE flag disabled,
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2024-05-31 11:50 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2024-05-31 11:50 UTC (permalink / raw
To: gentoo-commits
commit: dbe2a19e239f70c93128c669697d8acaa45c7ee7
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Fri May 31 08:21:00 2024 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Fri May 31 11:47:10 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbe2a19e
dev-util/perf: add keep arch/*/include when unpacking, bug #933193
Closes: https://bugs.gentoo.org/933193
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/perf-6.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-6.9.ebuild b/dev-util/perf/perf-6.9.ebuild
index c93e19c6c517..ead4f9c89c18 100644
--- a/dev-util/perf/perf-6.9.ebuild
+++ b/dev-util/perf/perf-6.9.ebuild
@@ -140,7 +140,7 @@ pkg_setup() {
src_unpack() {
local paths=(
kernel/bpf tools/{arch,bpf,build,include,lib,perf,scripts}
- scripts include lib "arch/*/lib" "arch/*/tools"
+ scripts include lib "arch/*/include" "arch/*/lib" "arch/*/tools"
)
# We expect the tar implementation to support the -j option (both
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2024-06-17 15:32 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2024-06-17 15:32 UTC (permalink / raw
To: gentoo-commits
commit: 9ce554d1fc45f2abf442cff7fb9a06b2a96460a1
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 17 15:31:59 2024 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Mon Jun 17 15:32:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ce554d1
dev-util/perf: set make option DEBUG=1 with USE=debug
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/perf-6.9.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-util/perf/perf-6.9.ebuild b/dev-util/perf/perf-6.9.ebuild
index ead4f9c89c18..b371ff4a861a 100644
--- a/dev-util/perf/perf-6.9.ebuild
+++ b/dev-util/perf/perf-6.9.ebuild
@@ -287,6 +287,7 @@ perf_make() {
NO_ZLIB=
TCMALLOC=$(usex tcmalloc 1 "")
WERROR=0
+ DEBUG=$(usex debug 1 "")
LIBDIR="/usr/libexec/perf-core"
libdir="${EPREFIX}/usr/$(get_libdir)"
plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2024-08-06 10:16 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2024-08-06 10:16 UTC (permalink / raw
To: gentoo-commits
commit: e0a308d54529e7cf11df4c9839024fe8187f82ee
Author: Andrej Shadura <andrew.shadura <AT> collabora <DOT> co <DOT> uk>
AuthorDate: Tue Jul 23 15:21:07 2024 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Tue Aug 6 10:15:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0a308d5
dev-util/perf: Use cross CLANG for compiler feature verification
The build system of perf checks the clang version in order to set
correct compilation flags. However, it defaults to the non-prefixed
clang invocation, which fails during cross-compilation.
Set CLANG to point to the fully qualified host clang.
The build system will only use it if it’s actually available.
Closes: https://bugs.gentoo.org/936558
Closes: https://github.com/gentoo/gentoo/pull/37688
Signed-off-by: Andrej Shadura <andrew.shadura <AT> collabora.co.uk>
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/perf-6.10.ebuild | 1 +
dev-util/perf/perf-6.3.ebuild | 1 +
dev-util/perf/perf-6.7.ebuild | 1 +
dev-util/perf/perf-6.8.ebuild | 1 +
dev-util/perf/perf-6.9.ebuild | 1 +
5 files changed, 5 insertions(+)
diff --git a/dev-util/perf/perf-6.10.ebuild b/dev-util/perf/perf-6.10.ebuild
index 3a49940473e4..bf643c35c209 100644
--- a/dev-util/perf/perf-6.10.ebuild
+++ b/dev-util/perf/perf-6.10.ebuild
@@ -247,6 +247,7 @@ perf_make() {
V=1 VF=1
HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)"
CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="${linker}" NM="$(tc-getNM)"
+ CLANG="${CHOST}-clang"
PKG_CONFIG="$(tc-getPKG_CONFIG)"
prefix="${EPREFIX}/usr" bindir_relative="bin"
tipdir="share/doc/${PF}"
diff --git a/dev-util/perf/perf-6.3.ebuild b/dev-util/perf/perf-6.3.ebuild
index 80e9fe676047..63546a59a6ca 100644
--- a/dev-util/perf/perf-6.3.ebuild
+++ b/dev-util/perf/perf-6.3.ebuild
@@ -196,6 +196,7 @@ perf_make() {
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)" \
+ CLANG="${CHOST}-clang" \
PKG_CONFIG="$(tc-getPKG_CONFIG)" \
prefix="${EPREFIX}/usr" bindir_relative="bin" \
tipdir="share/doc/${PF}" \
diff --git a/dev-util/perf/perf-6.7.ebuild b/dev-util/perf/perf-6.7.ebuild
index 5d0dd06b320d..f07ddebfbf7d 100644
--- a/dev-util/perf/perf-6.7.ebuild
+++ b/dev-util/perf/perf-6.7.ebuild
@@ -247,6 +247,7 @@ perf_make() {
V=1 VF=1
HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)"
CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="${linker}" NM="$(tc-getNM)"
+ CLANG="${CHOST}-clang"
PKG_CONFIG="$(tc-getPKG_CONFIG)"
prefix="${EPREFIX}/usr" bindir_relative="bin"
tipdir="share/doc/${PF}"
diff --git a/dev-util/perf/perf-6.8.ebuild b/dev-util/perf/perf-6.8.ebuild
index 71d7382d4545..9ebf28d8aa78 100644
--- a/dev-util/perf/perf-6.8.ebuild
+++ b/dev-util/perf/perf-6.8.ebuild
@@ -248,6 +248,7 @@ perf_make() {
V=1 VF=1
HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)"
CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="${linker}" NM="$(tc-getNM)"
+ CLANG="${CHOST}-clang"
PKG_CONFIG="$(tc-getPKG_CONFIG)"
prefix="${EPREFIX}/usr" bindir_relative="bin"
tipdir="share/doc/${PF}"
diff --git a/dev-util/perf/perf-6.9.ebuild b/dev-util/perf/perf-6.9.ebuild
index b371ff4a861a..e5858270dcbc 100644
--- a/dev-util/perf/perf-6.9.ebuild
+++ b/dev-util/perf/perf-6.9.ebuild
@@ -247,6 +247,7 @@ perf_make() {
V=1 VF=1
HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)"
CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="${linker}" NM="$(tc-getNM)"
+ CLANG="${CHOST}-clang"
PKG_CONFIG="$(tc-getPKG_CONFIG)"
prefix="${EPREFIX}/usr" bindir_relative="bin"
tipdir="share/doc/${PF}"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2024-08-06 10:16 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2024-08-06 10:16 UTC (permalink / raw
To: gentoo-commits
commit: 691f5d53899938ee921c032ee027e90c1f4a28e6
Author: Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com>
AuthorDate: Mon Aug 5 19:01:57 2024 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Tue Aug 6 10:15:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=691f5d53
dev-util/perf: bump to 6.10.3 & correctly apply patch updates
Closes: https://bugs.gentoo.org/937407
Closes: https://github.com/gentoo/gentoo/pull/37984
Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com>
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/Manifest | 1 +
dev-util/perf/perf-6.10.3.ebuild | 344 +++++++++++++++++++++++++++++++++++++++
2 files changed, 345 insertions(+)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index eaf7134c3fe1..f1003cdd10cb 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -3,3 +3,4 @@ DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf2
DIST linux-6.7.tar.xz 141406528 BLAKE2B cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e SHA512 de06de556191614bd9daf077ae239360352a402bab407748e67f1e5108c92fd933e451707840ab22fe0f9976db3d1e1b60ca9d41cf894f015ca09b3f652b74ad
DIST linux-6.8.tar.xz 142502100 BLAKE2B c6f17f816cea16e629f63e9379b98888713f57b2c5173306926471f139a9d612a0c74e119341f8075390e55e203d787d9edeb4ad5a064b18870f6f0f7ffaafb2 SHA512 5c4eb4aa1d3f7d1ea01c0f7ddeadacdece6e144fd4bdfc16b2b925d3e10dc04de3a6db69320b79a96c3560052616f001d2c09e7a1bb4f7b731e2380a7ecce068
DIST linux-6.9.tar.xz 144034416 BLAKE2B 4cf86c3cfe6e6534745d42dfaeca59b17ea1168c4e8b615c80e6d8aac735f11283cd85fa992b440b5d4452917e94b9f08397a64af0be5894e3df23c68892377e SHA512 fed3b4cd1fbfb4d94618587c1934273d2ecc8b6e42a3d586ff8a5f24980be930f2ef803aa2923ca3bfa5e4e619f967f3af315368f24fa76f610b10443624a579
+DIST patch-6.10.3.xz 252260 BLAKE2B 65acf62ff3e326d5ebb9f47067b626a25295fde2057531cf43e537601c42b0110419c0d6eee8c7c24e5d6d88ecf30e9b76d516efb925c91817504c52780b4df1 SHA512 28ad0de2086ca4b59637f8a7c69c6f5436b53235bf52c9ee18f428748c773780c54606a5c96d71614cadd49c707a8bb11843a7393da078e15d7f554244bfb9ca
diff --git a/dev-util/perf/perf-6.10.3.ebuild b/dev-util/perf/perf-6.10.3.ebuild
new file mode 100644
index 000000000000..0f0e90117809
--- /dev/null
+++ b/dev-util/perf/perf-6.10.3.ebuild
@@ -0,0 +1,344 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit bash-completion-r1 estack flag-o-matic linux-info llvm toolchain-funcs python-r1
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+ LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+ PATCH_VERSION=$(ver_cut 1-3)
+ LINUX_PATCH=patch-${PV//_/-}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+ https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ ${PV} == *.*.* ]] ; then
+ # stable-release series
+ LINUX_VER=$(ver_cut 1-2)
+ LINUX_PATCH=patch-${PV}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+ LINUX_VER=${PV}
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 audit babeltrace capstone big-endian bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+"
+
+# setuptools (and Python) are always needed even if not building Python bindings
+BDEPEND="
+ ${LINUX_PATCH+dev-util/patchutils}
+ ${PYTHON_DEPS}
+ >=app-arch/tar-1.34-r2
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ app-alternatives/yacc
+ app-alternatives/lex
+ virtual/pkgconfig
+ doc? (
+ app-text/asciidoc
+ app-text/sgml-common
+ app-text/xmlto
+ sys-process/time
+ )
+"
+
+RDEPEND="
+ audit? ( sys-process/audit )
+ babeltrace? ( dev-util/babeltrace:0/1 )
+ bpf? (
+ dev-libs/libbpf
+ dev-util/bpftool
+ dev-util/pahole
+ sys-devel/clang:=
+ sys-devel/llvm:=
+ )
+ caps? ( sys-libs/libcap )
+ capstone? ( dev-libs/capstone )
+ crypt? ( dev-libs/openssl:= )
+ gtk? ( x11-libs/gtk+:2 )
+ java? ( virtual/jre:* )
+ libpfm? ( dev-libs/libpfm:= )
+ libtraceevent? ( dev-libs/libtraceevent )
+ libtracefs? ( dev-libs/libtracefs )
+ lzma? ( app-arch/xz-utils )
+ numa? ( sys-process/numactl )
+ perl? ( dev-lang/perl:= )
+ python? ( ${PYTHON_DEPS} )
+ slang? ( sys-libs/slang )
+ systemtap? ( dev-debug/systemtap )
+ tcmalloc? ( dev-util/google-perftools )
+ unwind? ( sys-libs/libunwind:= )
+ zstd? ( app-arch/zstd:= )
+ dev-libs/elfutils
+ sys-libs/binutils-libs:=
+ sys-libs/zlib
+ virtual/libcrypt
+"
+
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-5.10
+ java? ( virtual/jdk )
+"
+
+QA_FLAGS_IGNORED=(
+ 'usr/bin/perf-read-vdso32' # not linked with anything except for libc
+ 'usr/libexec/perf-core/dlfilters/.*' # plugins
+)
+
+pkg_pretend() {
+ if ! use doc ; then
+ ewarn "Without the doc USE flag you won't get any documentation nor man pages."
+ ewarn "And without man pages, you won't get any --help output for perf and its"
+ ewarn "sub-tools."
+ fi
+}
+
+pkg_setup() {
+ local CONFIG_CHECK="
+ ~DEBUG_INFO
+ ~FTRACE
+ ~FTRACE_SYSCALLS
+ ~FUNCTION_TRACER
+ ~KALLSYMS
+ ~KALLSYMS_ALL
+ ~KPROBES
+ ~KPROBE_EVENTS
+ ~PERF_EVENTS
+ ~UPROBES
+ ~UPROBE_EVENTS
+ "
+
+ use bpf && llvm_pkg_setup
+ # We enable python unconditionally as libbpf always generates
+ # API headers using python script
+ python_setup
+
+ if use bpf ; then
+ CONFIG_CHECK+="~BPF ~BPF_EVENTS ~BPF_SYSCALL ~DEBUG_INFO_BTF ~HAVE_EBPF_JIT"
+ fi
+
+ linux-info_pkg_setup
+}
+
+# src_unpack and src_prepare are copied to dev-util/bpftool since
+# it's building from the same tarball, please keep it in sync with bpftool
+src_unpack() {
+ local paths=(
+ 'arch/*/include/*' 'arch/*/lib/*' 'arch/*/tools/*' 'include/*'
+ 'kernel/bpf/*' 'lib/*' 'scripts/*' 'tools/arch/*' 'tools/bpf/*'
+ 'tools/build/*' 'tools/include/*' 'tools/lib/*' 'tools/perf/*'
+ 'tools/scripts/*'
+ )
+
+ # We expect the tar implementation to support the -j option (both
+ # GNU tar and libarchive's tar support that).
+ echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+ gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+ "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ eshopts_push -o noglob
+ ebegin "Filtering partial source patch"
+ xzcat "${DISTDIR}"/${LINUX_PATCH} | filterdiff -p1 ${paths[@]/#/-i} > ${P}.patch
+ test -s ${P}.patch
+ assert -n "Unpacking to ${P} from ${DISTDIR}/${LINUX_PATCH} failed"
+ eend $? || die "filterdiff failed"
+ eshopts_pop
+ fi
+
+ local a
+ for a in ${A}; do
+ [[ ${a} == ${LINUX_SOURCES} ]] && continue
+ [[ ${a} == ${LINUX_PATCH} ]] && continue
+ unpack ${a}
+ done
+}
+
+src_prepare() {
+ default
+ if [[ -n ${LINUX_PATCH} ]] ; then
+ pushd "${S_K}" >/dev/null || die
+ eapply "${WORKDIR}"/${P}.patch
+ popd || die
+ fi
+
+ pushd "${S_K}" >/dev/null || die
+ eapply "${FILESDIR}"/perf-6.4-libtracefs.patch
+ eapply "${FILESDIR}"/perf-6.10-expr.patch
+ popd || die
+
+ # 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 \
+ "${S_K}"/tools/lib/perf/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' {} +
+}
+
+puse() { usex $1 "" 1; }
+perf_make() {
+ # The arch parsing is a bit funky. The perf tools package is integrated
+ # into the kernel, so it wants an ARCH that looks like the kernel arch,
+ # but it also wants to know about the split value -- i386/x86_64 vs just
+ # x86. We can get that by telling the func to use an older linux version.
+ # It's kind of a hack, but not that bad ...
+
+ # LIBDIR sets a search path of perf-gtk.so. Bug 515954
+
+ local arch=$(tc-arch-kernel)
+ local java_dir
+ use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
+
+ # sync this with the whitelist in tools/perf/Makefile.config
+ local disable_libdw
+ if ! use amd64 && ! use x86 && \
+ ! use arm && \
+ ! use arm64 && \
+ ! use ppc && ! use ppc64 \
+ ! use s390 && \
+ ! use riscv && \
+ ! use loong
+ then
+ disable_libdw=1
+ fi
+
+ # perf directly invokes LD for linking without going through CC, on mips
+ # it is required to specify the emulation. port of below buildroot patch
+ # https://patchwork.ozlabs.org/project/buildroot/patch/20170217105905.32151-1-Vincent.Riera@imgtec.com/
+ local linker="$(tc-getLD)"
+ if use mips
+ then
+ if use big-endian
+ then
+ use abi_mips_n64 && linker+=" -m elf64btsmip"
+ use abi_mips_n32 && linker+=" -m elf32btsmipn32"
+ use abi_mips_o32 && linker+=" -m elf32btsmip"
+ else
+ use abi_mips_n64 && linker+=" -m elf64ltsmip"
+ use abi_mips_n32 && linker+=" -m elf32ltsmipn32"
+ use abi_mips_o32 && linker+=" -m elf32ltsmip"
+ fi
+ fi
+
+ # FIXME: NO_CORESIGHT
+ local emakeargs=(
+ V=1 VF=1
+ HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)"
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="${linker}" NM="$(tc-getNM)"
+ CLANG="${CHOST}-clang"
+ PKG_CONFIG="$(tc-getPKG_CONFIG)"
+ prefix="${EPREFIX}/usr" bindir_relative="bin"
+ tipdir="share/doc/${PF}"
+ EXTRA_CFLAGS="${CFLAGS}"
+ EXTRA_LDFLAGS="${LDFLAGS}"
+ ARCH="${arch}"
+ BUILD_BPF_SKEL=$(usex bpf 1 "") \
+ BUILD_NONDISTRO=1
+ JDIR="${java_dir}"
+ CORESIGHT=
+ GTK2=$(usex gtk 1 "")
+ feature-gtk2-infobar=$(usex gtk 1 "")
+ NO_AUXTRACE=
+ NO_BACKTRACE=
+ NO_CAPSTONE=$(puse capstone)
+ NO_DEMANGLE=
+ NO_JEVENTS=$(puse python)
+ NO_JVMTI=$(puse java)
+ NO_LIBAUDIT=$(puse audit)
+ NO_LIBBABELTRACE=$(puse babeltrace)
+ NO_LIBBIONIC=1
+ NO_LIBBPF=$(puse bpf)
+ NO_LIBCAP=$(puse caps)
+ NO_LIBCRYPTO=$(puse crypt)
+ NO_LIBDW_DWARF_UNWIND="${disable_libdw}"
+ NO_LIBELF=
+ NO_LIBNUMA=$(puse numa)
+ NO_LIBPERL=$(puse perl)
+ NO_LIBPFM4=$(puse libpfm)
+ NO_LIBPYTHON=$(puse python)
+ NO_LIBTRACEEVENT=$(puse libtraceevent)
+ NO_LIBUNWIND=$(puse unwind)
+ NO_LIBZSTD=$(puse zstd)
+ NO_SDT=$(puse systemtap)
+ NO_SHELLCHECK=1
+ NO_SLANG=$(puse slang)
+ NO_LZMA=$(puse lzma)
+ NO_ZLIB=
+ TCMALLOC=$(usex tcmalloc 1 "")
+ WERROR=0
+ DEBUG=$(usex debug 1 "")
+ LIBDIR="/usr/libexec/perf-core"
+ libdir="${EPREFIX}/usr/$(get_libdir)"
+ plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins"
+ "$@"
+ )
+ emake "${emakeargs[@]}"
+}
+
+src_compile() {
+ filter-lto
+
+ perf_make -f Makefile.perf
+ use doc && perf_make -C Documentation man
+}
+
+src_test() {
+ :
+}
+
+src_install() {
+ _install_python_ext() {
+ perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
+ }
+
+ perf_make -f Makefile.perf install DESTDIR="${D}"
+
+ if use python; then
+ python_foreach_impl _install_python_ext
+ fi
+
+ if use gtk; then
+ local libdir
+ libdir="$(get_libdir)"
+ # on some arches it ends up in lib even on 64bit, ppc64 for instance.
+ [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
+ mv "${ED}"/usr/${libdir}/libperf-gtk.so \
+ "${ED}"/usr/libexec/perf-core || die
+ fi
+
+ dodoc CREDITS
+
+ dodoc *txt Documentation/*.txt
+
+ # perf needs this decompressed to print out tips for users
+ docompress -x /usr/share/doc/${PF}/tips.txt
+
+ if use doc ; then
+ doman Documentation/*.1
+ fi
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2024-08-06 12:09 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2024-08-06 12:09 UTC (permalink / raw
To: gentoo-commits
commit: b9ac6043978ea1f9820a072d7a169bbe1ffc5cc4
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 6 12:09:00 2024 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Tue Aug 6 12:09:00 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9ac6043
dev-util/perf: drop 6.8, 6.9
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/Manifest | 2 -
dev-util/perf/perf-6.8.ebuild | 339 -----------------------------------------
dev-util/perf/perf-6.9.ebuild | 341 ------------------------------------------
3 files changed, 682 deletions(-)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index f1003cdd10cb..06c6db108c8b 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,6 +1,4 @@
DIST linux-6.10.tar.xz 145142812 BLAKE2B bb243ea7493b9d63aa2df2050a3f1ae2b89ee84a20015239cf157e3f4f51c7ac5efedc8a51132b2d7482f9276ac418de6624831c8a3b806130d9c2d2124c539b SHA512 baa2487954044f991d2ae254d77d14a1f0185dd62c9f0fcaff69f586c9f906823017b8db1c4588f27b076dfa3ebb606929fec859f60ea419e7974330b9289cc2
DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
DIST linux-6.7.tar.xz 141406528 BLAKE2B cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e SHA512 de06de556191614bd9daf077ae239360352a402bab407748e67f1e5108c92fd933e451707840ab22fe0f9976db3d1e1b60ca9d41cf894f015ca09b3f652b74ad
-DIST linux-6.8.tar.xz 142502100 BLAKE2B c6f17f816cea16e629f63e9379b98888713f57b2c5173306926471f139a9d612a0c74e119341f8075390e55e203d787d9edeb4ad5a064b18870f6f0f7ffaafb2 SHA512 5c4eb4aa1d3f7d1ea01c0f7ddeadacdece6e144fd4bdfc16b2b925d3e10dc04de3a6db69320b79a96c3560052616f001d2c09e7a1bb4f7b731e2380a7ecce068
-DIST linux-6.9.tar.xz 144034416 BLAKE2B 4cf86c3cfe6e6534745d42dfaeca59b17ea1168c4e8b615c80e6d8aac735f11283cd85fa992b440b5d4452917e94b9f08397a64af0be5894e3df23c68892377e SHA512 fed3b4cd1fbfb4d94618587c1934273d2ecc8b6e42a3d586ff8a5f24980be930f2ef803aa2923ca3bfa5e4e619f967f3af315368f24fa76f610b10443624a579
DIST patch-6.10.3.xz 252260 BLAKE2B 65acf62ff3e326d5ebb9f47067b626a25295fde2057531cf43e537601c42b0110419c0d6eee8c7c24e5d6d88ecf30e9b76d516efb925c91817504c52780b4df1 SHA512 28ad0de2086ca4b59637f8a7c69c6f5436b53235bf52c9ee18f428748c773780c54606a5c96d71614cadd49c707a8bb11843a7393da078e15d7f554244bfb9ca
diff --git a/dev-util/perf/perf-6.8.ebuild b/dev-util/perf/perf-6.8.ebuild
deleted file mode 100644
index 9ebf28d8aa78..000000000000
--- a/dev-util/perf/perf-6.8.ebuild
+++ /dev/null
@@ -1,339 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit bash-completion-r1 estack flag-o-matic linux-info llvm toolchain-funcs python-r1
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
- LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
- PATCH_VERSION=$(ver_cut 1-3)
- LINUX_PATCH=patch-${PV//_/-}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
- https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ ${PV} == *.*.* ]] ; then
- # stable-release series
- LINUX_VER=$(ver_cut 1-2)
- LINUX_PATCH=patch-${PV}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
- LINUX_VER=${PV}
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 audit babeltrace big-endian bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
-"
-
-# setuptools (and Python) are always needed even if not building Python bindings
-BDEPEND="
- ${LINUX_PATCH+dev-util/patchutils}
- ${PYTHON_DEPS}
- >=app-arch/tar-1.34-r2
- dev-python/setuptools[${PYTHON_USEDEP}]
- app-alternatives/yacc
- app-alternatives/lex
- virtual/pkgconfig
- doc? (
- app-text/asciidoc
- app-text/sgml-common
- app-text/xmlto
- sys-process/time
- )
-"
-
-RDEPEND="
- audit? ( sys-process/audit )
- babeltrace? ( dev-util/babeltrace:0/1 )
- bpf? (
- dev-libs/libbpf
- dev-util/bpftool
- dev-util/pahole
- )
- caps? ( sys-libs/libcap )
- bpf? (
- sys-devel/clang:=
- sys-devel/llvm:=
- )
- crypt? ( dev-libs/openssl:= )
- gtk? ( x11-libs/gtk+:2 )
- java? ( virtual/jre:* )
- libpfm? ( dev-libs/libpfm:= )
- libtraceevent? ( dev-libs/libtraceevent )
- libtracefs? ( dev-libs/libtracefs )
- lzma? ( app-arch/xz-utils )
- numa? ( sys-process/numactl )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- slang? ( sys-libs/slang )
- systemtap? ( dev-debug/systemtap )
- tcmalloc? ( dev-util/google-perftools )
- unwind? ( sys-libs/libunwind:= )
- zstd? ( app-arch/zstd:= )
- dev-libs/elfutils
- sys-libs/binutils-libs:=
- sys-libs/zlib
- virtual/libcrypt
-"
-
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-5.10
- java? ( virtual/jdk )
-"
-
-QA_FLAGS_IGNORED=(
- 'usr/bin/perf-read-vdso32' # not linked with anything except for libc
- 'usr/libexec/perf-core/dlfilters/.*' # plugins
-)
-
-pkg_pretend() {
- if ! use doc ; then
- ewarn "Without the doc USE flag you won't get any documentation nor man pages."
- ewarn "And without man pages, you won't get any --help output for perf and its"
- ewarn "sub-tools."
- fi
-}
-
-pkg_setup() {
- local CONFIG_CHECK="
- ~DEBUG_INFO
- ~FTRACE
- ~FTRACE_SYSCALLS
- ~FUNCTION_TRACER
- ~KALLSYMS
- ~KALLSYMS_ALL
- ~KPROBES
- ~KPROBE_EVENTS
- ~PERF_EVENTS
- ~UPROBES
- ~UPROBE_EVENTS
- "
-
- use bpf && llvm_pkg_setup
- # We enable python unconditionally as libbpf always generates
- # API headers using python script
- python_setup
-
- if use bpf ; then
- CONFIG_CHECK+="~BPF ~BPF_EVENTS ~BPF_SYSCALL ~DEBUG_INFO_BTF ~HAVE_EBPF_JIT"
- fi
-
- linux-info_pkg_setup
-}
-
-# src_unpack and src_prepare are copied to dev-util/bpftool since
-# it's building from the same tarball, please keep it in sync with bpftool
-src_unpack() {
- local paths=(
- kernel/bpf tools/{arch,bpf,build,include,lib,perf,scripts}
- scripts include lib "arch/*/lib" "arch/*/tools"
- )
-
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
- > ${P}.patch
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- done
-}
-
-src_prepare() {
- default
- if [[ -n ${LINUX_PATCH} ]] ; then
- pushd "${S_K}" >/dev/null || die
- eapply "${WORKDIR}"/${P}.patch
- popd || die
- fi
-
- pushd "${S_K}" >/dev/null || die
- eapply "${FILESDIR}"/perf-6.4-libtracefs.patch
- eapply "${FILESDIR}"/perf-6.7-expr.patch
- popd || die
-
- # 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 \
- "${S_K}"/tools/lib/perf/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' {} +
-}
-
-puse() { usex $1 "" 1; }
-perf_make() {
- # The arch parsing is a bit funky. The perf tools package is integrated
- # into the kernel, so it wants an ARCH that looks like the kernel arch,
- # but it also wants to know about the split value -- i386/x86_64 vs just
- # x86. We can get that by telling the func to use an older linux version.
- # It's kind of a hack, but not that bad ...
-
- # LIBDIR sets a search path of perf-gtk.so. Bug 515954
-
- local arch=$(tc-arch-kernel)
- local java_dir
- use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
-
- # sync this with the whitelist in tools/perf/Makefile.config
- local disable_libdw
- if ! use amd64 && ! use x86 && \
- ! use arm && \
- ! use arm64 && \
- ! use ppc && ! use ppc64 \
- ! use s390 && \
- ! use riscv && \
- ! use loong
- then
- disable_libdw=1
- fi
-
- # perf directly invokes LD for linking without going through CC, on mips
- # it is required to specify the emulation. port of below buildroot patch
- # https://patchwork.ozlabs.org/project/buildroot/patch/20170217105905.32151-1-Vincent.Riera@imgtec.com/
- local linker="$(tc-getLD)"
- if use mips
- then
- if use big-endian
- then
- use abi_mips_n64 && linker+=" -m elf64btsmip"
- use abi_mips_n32 && linker+=" -m elf32btsmipn32"
- use abi_mips_o32 && linker+=" -m elf32btsmip"
- else
- use abi_mips_n64 && linker+=" -m elf64ltsmip"
- use abi_mips_n32 && linker+=" -m elf32ltsmipn32"
- use abi_mips_o32 && linker+=" -m elf32ltsmip"
- fi
- fi
-
- # FIXME: NO_CORESIGHT
- local emakeargs=(
- V=1 VF=1
- HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)"
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="${linker}" NM="$(tc-getNM)"
- CLANG="${CHOST}-clang"
- PKG_CONFIG="$(tc-getPKG_CONFIG)"
- prefix="${EPREFIX}/usr" bindir_relative="bin"
- tipdir="share/doc/${PF}"
- EXTRA_CFLAGS="${CFLAGS}"
- EXTRA_LDFLAGS="${LDFLAGS}"
- ARCH="${arch}"
- BUILD_BPF_SKEL=$(usex bpf 1 "") \
- BUILD_NONDISTRO=1
- JDIR="${java_dir}"
- CORESIGHT=
- GTK2=$(usex gtk 1 "")
- feature-gtk2-infobar=$(usex gtk 1 "")
- NO_AUXTRACE=
- NO_BACKTRACE=
- NO_DEMANGLE=
- NO_JEVENTS=$(puse python)
- NO_JVMTI=$(puse java)
- NO_LIBAUDIT=$(puse audit)
- NO_LIBBABELTRACE=$(puse babeltrace)
- NO_LIBBIONIC=1
- NO_LIBBPF=$(puse bpf)
- NO_LIBCAP=$(puse caps)
- NO_LIBCRYPTO=$(puse crypt)
- NO_LIBDW_DWARF_UNWIND="${disable_libdw}"
- NO_LIBELF=
- NO_LIBNUMA=$(puse numa)
- NO_LIBPERL=$(puse perl)
- NO_LIBPFM4=$(puse libpfm)
- NO_LIBPYTHON=$(puse python)
- NO_LIBTRACEEVENT=$(puse libtraceevent)
- NO_LIBUNWIND=$(puse unwind)
- NO_LIBZSTD=$(puse zstd)
- NO_SDT=$(puse systemtap)
- NO_SLANG=$(puse slang)
- NO_LZMA=$(puse lzma)
- NO_ZLIB=
- TCMALLOC=$(usex tcmalloc 1 "")
- WERROR=0
- LIBDIR="/usr/libexec/perf-core"
- libdir="${EPREFIX}/usr/$(get_libdir)"
- plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins"
- "$@"
- )
- emake "${emakeargs[@]}"
-}
-
-src_compile() {
- filter-lto
-
- perf_make -f Makefile.perf
- use doc && perf_make -C Documentation man
-}
-
-src_test() {
- :
-}
-
-src_install() {
- _install_python_ext() {
- perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
- }
-
- perf_make -f Makefile.perf install DESTDIR="${D}"
-
- if use python; then
- python_foreach_impl _install_python_ext
- fi
-
- if use gtk; then
- local libdir
- libdir="$(get_libdir)"
- # on some arches it ends up in lib even on 64bit, ppc64 for instance.
- [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
- mv "${ED}"/usr/${libdir}/libperf-gtk.so \
- "${ED}"/usr/libexec/perf-core || die
- fi
-
- dodoc CREDITS
-
- dodoc *txt Documentation/*.txt
-
- # perf needs this decompressed to print out tips for users
- docompress -x /usr/share/doc/${PF}/tips.txt
-
- if use doc ; then
- doman Documentation/*.1
- fi
-}
diff --git a/dev-util/perf/perf-6.9.ebuild b/dev-util/perf/perf-6.9.ebuild
deleted file mode 100644
index e5858270dcbc..000000000000
--- a/dev-util/perf/perf-6.9.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit bash-completion-r1 estack flag-o-matic linux-info llvm toolchain-funcs python-r1
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
- LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
- PATCH_VERSION=$(ver_cut 1-3)
- LINUX_PATCH=patch-${PV//_/-}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
- https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ ${PV} == *.*.* ]] ; then
- # stable-release series
- LINUX_VER=$(ver_cut 1-2)
- LINUX_PATCH=patch-${PV}.xz
- SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
- LINUX_VER=${PV}
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 audit babeltrace capstone big-endian bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
-"
-
-# setuptools (and Python) are always needed even if not building Python bindings
-BDEPEND="
- ${LINUX_PATCH+dev-util/patchutils}
- ${PYTHON_DEPS}
- >=app-arch/tar-1.34-r2
- dev-python/setuptools[${PYTHON_USEDEP}]
- app-alternatives/yacc
- app-alternatives/lex
- virtual/pkgconfig
- doc? (
- app-text/asciidoc
- app-text/sgml-common
- app-text/xmlto
- sys-process/time
- )
-"
-
-RDEPEND="
- audit? ( sys-process/audit )
- babeltrace? ( dev-util/babeltrace:0/1 )
- bpf? (
- dev-libs/libbpf
- dev-util/bpftool
- dev-util/pahole
- sys-devel/clang:=
- sys-devel/llvm:=
- )
- caps? ( sys-libs/libcap )
- capstone? ( dev-libs/capstone )
- crypt? ( dev-libs/openssl:= )
- gtk? ( x11-libs/gtk+:2 )
- java? ( virtual/jre:* )
- libpfm? ( dev-libs/libpfm:= )
- libtraceevent? ( dev-libs/libtraceevent )
- libtracefs? ( dev-libs/libtracefs )
- lzma? ( app-arch/xz-utils )
- numa? ( sys-process/numactl )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- slang? ( sys-libs/slang )
- systemtap? ( dev-debug/systemtap )
- tcmalloc? ( dev-util/google-perftools )
- unwind? ( sys-libs/libunwind:= )
- zstd? ( app-arch/zstd:= )
- dev-libs/elfutils
- sys-libs/binutils-libs:=
- sys-libs/zlib
- virtual/libcrypt
-"
-
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-5.10
- java? ( virtual/jdk )
-"
-
-QA_FLAGS_IGNORED=(
- 'usr/bin/perf-read-vdso32' # not linked with anything except for libc
- 'usr/libexec/perf-core/dlfilters/.*' # plugins
-)
-
-pkg_pretend() {
- if ! use doc ; then
- ewarn "Without the doc USE flag you won't get any documentation nor man pages."
- ewarn "And without man pages, you won't get any --help output for perf and its"
- ewarn "sub-tools."
- fi
-}
-
-pkg_setup() {
- local CONFIG_CHECK="
- ~DEBUG_INFO
- ~FTRACE
- ~FTRACE_SYSCALLS
- ~FUNCTION_TRACER
- ~KALLSYMS
- ~KALLSYMS_ALL
- ~KPROBES
- ~KPROBE_EVENTS
- ~PERF_EVENTS
- ~UPROBES
- ~UPROBE_EVENTS
- "
-
- use bpf && llvm_pkg_setup
- # We enable python unconditionally as libbpf always generates
- # API headers using python script
- python_setup
-
- if use bpf ; then
- CONFIG_CHECK+="~BPF ~BPF_EVENTS ~BPF_SYSCALL ~DEBUG_INFO_BTF ~HAVE_EBPF_JIT"
- fi
-
- linux-info_pkg_setup
-}
-
-# src_unpack and src_prepare are copied to dev-util/bpftool since
-# it's building from the same tarball, please keep it in sync with bpftool
-src_unpack() {
- local paths=(
- kernel/bpf tools/{arch,bpf,build,include,lib,perf,scripts}
- scripts include lib "arch/*/include" "arch/*/lib" "arch/*/tools"
- )
-
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
- > ${P}.patch
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- done
-}
-
-src_prepare() {
- default
- if [[ -n ${LINUX_PATCH} ]] ; then
- pushd "${S_K}" >/dev/null || die
- eapply "${WORKDIR}"/${P}.patch
- popd || die
- fi
-
- pushd "${S_K}" >/dev/null || die
- eapply "${FILESDIR}"/perf-6.4-libtracefs.patch
- eapply "${FILESDIR}"/perf-6.7-expr.patch
- popd || die
-
- # 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 \
- "${S_K}"/tools/lib/perf/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' {} +
-}
-
-puse() { usex $1 "" 1; }
-perf_make() {
- # The arch parsing is a bit funky. The perf tools package is integrated
- # into the kernel, so it wants an ARCH that looks like the kernel arch,
- # but it also wants to know about the split value -- i386/x86_64 vs just
- # x86. We can get that by telling the func to use an older linux version.
- # It's kind of a hack, but not that bad ...
-
- # LIBDIR sets a search path of perf-gtk.so. Bug 515954
-
- local arch=$(tc-arch-kernel)
- local java_dir
- use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
-
- # sync this with the whitelist in tools/perf/Makefile.config
- local disable_libdw
- if ! use amd64 && ! use x86 && \
- ! use arm && \
- ! use arm64 && \
- ! use ppc && ! use ppc64 \
- ! use s390 && \
- ! use riscv && \
- ! use loong
- then
- disable_libdw=1
- fi
-
- # perf directly invokes LD for linking without going through CC, on mips
- # it is required to specify the emulation. port of below buildroot patch
- # https://patchwork.ozlabs.org/project/buildroot/patch/20170217105905.32151-1-Vincent.Riera@imgtec.com/
- local linker="$(tc-getLD)"
- if use mips
- then
- if use big-endian
- then
- use abi_mips_n64 && linker+=" -m elf64btsmip"
- use abi_mips_n32 && linker+=" -m elf32btsmipn32"
- use abi_mips_o32 && linker+=" -m elf32btsmip"
- else
- use abi_mips_n64 && linker+=" -m elf64ltsmip"
- use abi_mips_n32 && linker+=" -m elf32ltsmipn32"
- use abi_mips_o32 && linker+=" -m elf32ltsmip"
- fi
- fi
-
- # FIXME: NO_CORESIGHT
- local emakeargs=(
- V=1 VF=1
- HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)"
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="${linker}" NM="$(tc-getNM)"
- CLANG="${CHOST}-clang"
- PKG_CONFIG="$(tc-getPKG_CONFIG)"
- prefix="${EPREFIX}/usr" bindir_relative="bin"
- tipdir="share/doc/${PF}"
- EXTRA_CFLAGS="${CFLAGS}"
- EXTRA_LDFLAGS="${LDFLAGS}"
- ARCH="${arch}"
- BUILD_BPF_SKEL=$(usex bpf 1 "") \
- BUILD_NONDISTRO=1
- JDIR="${java_dir}"
- CORESIGHT=
- GTK2=$(usex gtk 1 "")
- feature-gtk2-infobar=$(usex gtk 1 "")
- NO_AUXTRACE=
- NO_BACKTRACE=
- NO_CAPSTONE=$(puse capstone)
- NO_DEMANGLE=
- NO_JEVENTS=$(puse python)
- NO_JVMTI=$(puse java)
- NO_LIBAUDIT=$(puse audit)
- NO_LIBBABELTRACE=$(puse babeltrace)
- NO_LIBBIONIC=1
- NO_LIBBPF=$(puse bpf)
- NO_LIBCAP=$(puse caps)
- NO_LIBCRYPTO=$(puse crypt)
- NO_LIBDW_DWARF_UNWIND="${disable_libdw}"
- NO_LIBELF=
- NO_LIBNUMA=$(puse numa)
- NO_LIBPERL=$(puse perl)
- NO_LIBPFM4=$(puse libpfm)
- NO_LIBPYTHON=$(puse python)
- NO_LIBTRACEEVENT=$(puse libtraceevent)
- NO_LIBUNWIND=$(puse unwind)
- NO_LIBZSTD=$(puse zstd)
- NO_SDT=$(puse systemtap)
- NO_SHELLCHECK=1
- NO_SLANG=$(puse slang)
- NO_LZMA=$(puse lzma)
- NO_ZLIB=
- TCMALLOC=$(usex tcmalloc 1 "")
- WERROR=0
- DEBUG=$(usex debug 1 "")
- LIBDIR="/usr/libexec/perf-core"
- libdir="${EPREFIX}/usr/$(get_libdir)"
- plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins"
- "$@"
- )
- emake "${emakeargs[@]}"
-}
-
-src_compile() {
- filter-lto
-
- perf_make -f Makefile.perf
- use doc && perf_make -C Documentation man
-}
-
-src_test() {
- :
-}
-
-src_install() {
- _install_python_ext() {
- perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
- }
-
- perf_make -f Makefile.perf install DESTDIR="${D}"
-
- if use python; then
- python_foreach_impl _install_python_ext
- fi
-
- if use gtk; then
- local libdir
- libdir="$(get_libdir)"
- # on some arches it ends up in lib even on 64bit, ppc64 for instance.
- [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
- mv "${ED}"/usr/${libdir}/libperf-gtk.so \
- "${ED}"/usr/libexec/perf-core || die
- fi
-
- dodoc CREDITS
-
- dodoc *txt Documentation/*.txt
-
- # perf needs this decompressed to print out tips for users
- docompress -x /usr/share/doc/${PF}/tips.txt
-
- if use doc ; then
- doman Documentation/*.1
- fi
-}
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2024-08-12 11:20 Guilherme Amadio
0 siblings, 0 replies; 141+ messages in thread
From: Guilherme Amadio @ 2024-08-12 11:20 UTC (permalink / raw
To: gentoo-commits
commit: 97c31a746773d48ec5b1b2cf21a11ff2cf1d661c
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 12 10:05:46 2024 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 11:20:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97c31a74
dev-util/perf: add 6.10.4, drop 6.10.3
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
dev-util/perf/Manifest | 2 +-
dev-util/perf/{perf-6.10.3.ebuild => perf-6.10.4.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 06c6db108c8b..dcdacc5c4e18 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,4 +1,4 @@
DIST linux-6.10.tar.xz 145142812 BLAKE2B bb243ea7493b9d63aa2df2050a3f1ae2b89ee84a20015239cf157e3f4f51c7ac5efedc8a51132b2d7482f9276ac418de6624831c8a3b806130d9c2d2124c539b SHA512 baa2487954044f991d2ae254d77d14a1f0185dd62c9f0fcaff69f586c9f906823017b8db1c4588f27b076dfa3ebb606929fec859f60ea419e7974330b9289cc2
DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
DIST linux-6.7.tar.xz 141406528 BLAKE2B cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e SHA512 de06de556191614bd9daf077ae239360352a402bab407748e67f1e5108c92fd933e451707840ab22fe0f9976db3d1e1b60ca9d41cf894f015ca09b3f652b74ad
-DIST patch-6.10.3.xz 252260 BLAKE2B 65acf62ff3e326d5ebb9f47067b626a25295fde2057531cf43e537601c42b0110419c0d6eee8c7c24e5d6d88ecf30e9b76d516efb925c91817504c52780b4df1 SHA512 28ad0de2086ca4b59637f8a7c69c6f5436b53235bf52c9ee18f428748c773780c54606a5c96d71614cadd49c707a8bb11843a7393da078e15d7f554244bfb9ca
+DIST patch-6.10.4.xz 303168 BLAKE2B d38bbcdd2f730a030add5b38c1ab09c7081c311ed716d3ae976a058dd34b235078700cdff05d79dc93d9badb75c95566a3bdfc39dfa045d54857d82ee2c92e9d SHA512 5f5e8b19d114fed733c8c98a581fe339f8896e05e5da6a37deb1d7d8aa9dd83b3c80a97b1c6f3f51b6f20cca9c435b20c28c2c511da2026980d9fa72624cf420
diff --git a/dev-util/perf/perf-6.10.3.ebuild b/dev-util/perf/perf-6.10.4.ebuild
similarity index 100%
rename from dev-util/perf/perf-6.10.3.ebuild
rename to dev-util/perf/perf-6.10.4.ebuild
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2024-08-23 14:48 Sam James
0 siblings, 0 replies; 141+ messages in thread
From: Sam James @ 2024-08-23 14:48 UTC (permalink / raw
To: gentoo-commits
commit: 4f778cd76df0591f23a5470d3bea24de1a299eb0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 23 14:43:42 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 23 14:43:42 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f778cd7
dev-util/perf: fix assert use, as in bpftool
See a04d607f74f91f7ea103f3f33199adb14aa0a1e1.
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/perf/perf-6.10.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/perf/perf-6.10.4.ebuild b/dev-util/perf/perf-6.10.4.ebuild
index 4c50de412173..a8d59bf1b02c 100644
--- a/dev-util/perf/perf-6.10.4.ebuild
+++ b/dev-util/perf/perf-6.10.4.ebuild
@@ -155,9 +155,9 @@ src_unpack() {
eshopts_push -o noglob
ebegin "Filtering partial source patch"
xzcat "${DISTDIR}"/${LINUX_PATCH} | filterdiff -p1 ${paths[@]/#/-i} > ${P}.patch
- test -s ${P}.patch
assert -n "Unpacking to ${P} from ${DISTDIR}/${LINUX_PATCH} failed"
eend $? || die "filterdiff failed"
+ test -s ${P}.patch || die "patch is empty?!"
eshopts_pop
fi
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/
@ 2024-08-25 12:04 Andreas K. Hüttel
0 siblings, 0 replies; 141+ messages in thread
From: Andreas K. Hüttel @ 2024-08-25 12:04 UTC (permalink / raw
To: gentoo-commits
commit: a4c7724f5eac98d2c0d9028772a1d9834815fa8a
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 25 09:21:28 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Aug 25 12:02:57 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4c7724f
dev-util/perf: remove ~mips
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
dev-util/perf/perf-6.10.4.ebuild | 2 +-
dev-util/perf/perf-6.10.ebuild | 2 +-
dev-util/perf/perf-6.3.ebuild | 2 +-
dev-util/perf/perf-6.7.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-util/perf/perf-6.10.4.ebuild b/dev-util/perf/perf-6.10.4.ebuild
index a8d59bf1b02c..df1101c9dc14 100644
--- a/dev-util/perf/perf-6.10.4.ebuild
+++ b/dev-util/perf/perf-6.10.4.ebuild
@@ -33,7 +33,7 @@ S="${S_K}/tools/perf"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 audit babeltrace capstone big-endian bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
REQUIRED_USE="
diff --git a/dev-util/perf/perf-6.10.ebuild b/dev-util/perf/perf-6.10.ebuild
index c26fcdac95df..7668df3a67d1 100644
--- a/dev-util/perf/perf-6.10.ebuild
+++ b/dev-util/perf/perf-6.10.ebuild
@@ -33,7 +33,7 @@ S="${S_K}/tools/perf"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 audit babeltrace capstone big-endian bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
REQUIRED_USE="
diff --git a/dev-util/perf/perf-6.3.ebuild b/dev-util/perf/perf-6.3.ebuild
index 63546a59a6ca..9d36b0ce8ca7 100644
--- a/dev-util/perf/perf-6.3.ebuild
+++ b/dev-util/perf/perf-6.3.ebuild
@@ -33,7 +33,7 @@ S="${S_K}/tools/perf"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/perf/perf-6.7.ebuild b/dev-util/perf/perf-6.7.ebuild
index f07ddebfbf7d..99074877b2f2 100644
--- a/dev-util/perf/perf-6.7.ebuild
+++ b/dev-util/perf/perf-6.7.ebuild
@@ -33,7 +33,7 @@ S="${S_K}/tools/perf"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 audit babeltrace big-endian bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
REQUIRED_USE="
^ permalink raw reply related [flat|nested] 141+ messages in thread
end of thread, other threads:[~2024-08-25 12:04 UTC | newest]
Thread overview: 141+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-11 2:44 [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-08-25 12:04 Andreas K. Hüttel
2024-08-23 14:48 Sam James
2024-08-12 11:20 Guilherme Amadio
2024-08-06 12:09 Guilherme Amadio
2024-08-06 10:16 Guilherme Amadio
2024-08-06 10:16 Guilherme Amadio
2024-06-17 15:32 Guilherme Amadio
2024-05-31 11:50 Guilherme Amadio
2024-05-30 14:50 Guilherme Amadio
2024-05-24 15:38 Guilherme Amadio
2024-03-13 4:48 Sam James
2024-03-10 23:21 Jakov Smolić
2024-03-10 22:54 Guilherme Amadio
2024-03-10 22:54 Guilherme Amadio
2024-03-10 22:54 Guilherme Amadio
2024-03-10 20:00 Arthur Zamarin
2024-03-10 20:00 Arthur Zamarin
2024-03-10 19:52 Arthur Zamarin
2024-03-10 19:52 Arthur Zamarin
2024-01-30 14:36 Yixun Lan
2024-01-05 5:30 Sam James
2023-12-30 1:26 Ionen Wolkens
2023-12-28 2:57 Sam James
2023-10-30 9:25 Guilherme Amadio
2023-10-30 9:25 Guilherme Amadio
2023-10-30 9:25 Guilherme Amadio
2023-09-12 19:22 Guilherme Amadio
2023-07-11 11:03 WANG Xuerui
2023-07-10 15:34 Matt Turner
2023-07-06 16:12 Guilherme Amadio
2023-07-06 15:49 Guilherme Amadio
2023-06-28 17:33 Matt Turner
2023-06-28 17:33 Matt Turner
2023-06-28 17:33 Matt Turner
2023-06-28 17:33 Matt Turner
2023-06-28 17:33 Matt Turner
2023-06-28 17:33 Matt Turner
2023-06-28 17:33 Matt Turner
2023-06-28 17:33 Matt Turner
2023-06-28 17:33 Matt Turner
2023-06-24 3:22 Sam James
2023-06-24 3:22 Sam James
2023-06-24 3:22 Sam James
2023-06-24 3:22 Sam James
2023-06-24 3:22 Sam James
2023-06-24 3:22 Sam James
2023-06-13 11:41 Sam James
2023-05-17 12:41 Yixun Lan
2023-03-02 9:40 Guilherme Amadio
2023-02-28 8:10 Guilherme Amadio
2023-02-23 20:29 Sam James
2023-02-13 20:09 Guilherme Amadio
2023-01-13 15:27 Naohiro Aota
2022-11-17 1:06 Sam James
2022-11-16 12:41 Sam James
2022-11-16 12:41 Sam James
2022-11-16 8:56 Arthur Zamarin
2022-11-16 8:52 Arthur Zamarin
2022-11-16 8:52 Arthur Zamarin
2022-09-05 1:14 Sam James
2022-09-05 0:43 Sam James
2022-06-16 9:34 Guilherme Amadio
2022-05-31 15:36 Guilherme Amadio
2022-05-31 15:36 Guilherme Amadio
2022-04-07 13:34 Guilherme Amadio
2022-04-07 10:14 Guilherme Amadio
2022-04-07 10:14 Guilherme Amadio
2022-01-03 9:19 Sam James
2022-01-02 9:59 Sam James
2022-01-02 5:52 Sam James
2022-01-01 15:15 Arthur Zamarin
2022-01-01 15:15 Arthur Zamarin
2022-01-01 15:15 Arthur Zamarin
2021-11-11 8:56 Guilherme Amadio
2021-11-10 15:14 Guilherme Amadio
2021-11-10 12:31 Guilherme Amadio
2021-11-10 12:31 Guilherme Amadio
2021-11-10 12:31 Guilherme Amadio
2021-09-13 17:48 Jakov Smolić
2021-08-05 2:17 Yixun Lan
2021-05-27 6:58 Mikle Kolyada
2021-05-22 18:55 Mikle Kolyada
2021-05-01 8:07 Sergei Trofimovich
2021-04-30 9:42 Guilherme Amadio
2021-04-30 9:12 Guilherme Amadio
2021-04-30 9:12 Guilherme Amadio
2021-04-30 9:12 Guilherme Amadio
2021-04-24 8:07 Sergei Trofimovich
2021-03-03 10:24 Guilherme Amadio
2021-02-17 9:37 David Seifert
2021-02-15 14:58 Yixun Lan
2021-02-06 21:33 Sam James
2020-12-18 10:14 Sergei Trofimovich
2020-11-19 16:10 Guilherme Amadio
2020-11-19 15:36 Guilherme Amadio
2020-11-19 15:36 Guilherme Amadio
2020-10-28 20:27 Georgy Yakovlev
2020-10-26 3:29 Georgy Yakovlev
2020-09-19 8:50 Michał Górny
2020-08-26 2:41 Yixun Lan
2020-08-26 2:41 Yixun Lan
2020-06-12 23:03 Sergei Trofimovich
2020-06-03 10:18 Guilherme Amadio
2020-05-26 0:47 Yixun Lan
2020-05-22 13:06 Guilherme Amadio
2020-05-17 17:39 Mike Frysinger
2020-05-07 15:08 Michał Górny
2020-05-06 8:26 Guilherme Amadio
2020-05-06 8:26 Guilherme Amadio
2020-05-06 8:26 Guilherme Amadio
2020-04-24 20:50 Guilherme Amadio
2020-04-17 15:05 Yixun Lan
2020-04-17 15:05 Yixun Lan
2020-02-15 16:05 Yixun Lan
2020-02-12 21:04 David Seifert
2020-01-05 22:17 Sven Wegener
2020-01-04 21:41 Naohiro Aota
2019-12-29 23:31 Mike Gilbert
2019-11-08 13:47 Andreas K. Hüttel
2019-10-20 1:06 Yixun Lan
2019-10-20 1:06 Yixun Lan
2019-08-07 14:51 Guilherme Amadio
2019-01-18 21:38 Naohiro Aota
2018-10-15 2:26 Naohiro Aota
2018-09-04 13:04 Luca Barbato
2018-06-04 19:25 Mart Raudsepp
2018-04-23 14:50 Aaron Bauman
2018-04-20 13:47 Yixun Lan
2018-03-26 4:05 Matt Turner
2018-03-17 17:11 Matt Turner
2018-01-11 1:34 Mike Frysinger
2017-11-26 11:39 David Seifert
2017-06-02 0:18 Jason Donenfeld
2017-05-24 14:51 Guilherme Amadio
2017-04-20 20:48 David Seifert
2017-02-28 6:35 Yixun Lan
2017-02-28 6:35 Yixun Lan
2016-11-09 14:04 Pacho Ramos
2016-03-08 13:10 Naohiro Aota
2015-08-14 15:23 Naohiro Aota
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox