diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/perf/Manifest index 46a7ae78c6..a8c77095f0 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/perf/Manifest @@ -1,5 +1,2 @@ -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 +DIST linux-6.4.tar.xz 137794856 BLAKE2B b59eb04a8715af9f686978812e6d4a466172bb859f80657076de14cd0828b4fac15b688ff8959f5c65485f7f6bef26590412c66821e720de843cb8666f226c90 SHA512 11a48b25e0b513782d3b89101c2ec8dd9cefd6ce08dc63a91137903b66392aa72ca1fe32816710673af84dd47de3ab8738056a6af93dc0d5e60ef4b869b49928 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.18-clang.patch b/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.18-clang.patch deleted file mode 100644 index d1c9a48e68..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.18-clang.patch +++ /dev/null @@ -1,45 +0,0 @@ - -Fix building against LLVM/Clang with monolithic libraries. - ---- a/tools/build/feature/Makefile -+++ b/tools/build/feature/Makefile -@@ -299,7 +299,7 @@ $(OUTPUT)test-llvm.bin: - $(BUILDXX) -std=gnu++14 \ - -I$(shell $(LLVM_CONFIG) --includedir) \ - -L$(shell $(LLVM_CONFIG) --libdir) \ -- $(shell $(LLVM_CONFIG) --libs Core BPF) \ -+ $(shell $(LLVM_CONFIG) --libs) \ - $(shell $(LLVM_CONFIG) --system-libs) \ - > $(@:.bin=.make.output) 2>&1 - -@@ -312,10 +312,7 @@ $(OUTPUT)test-clang.bin: - $(BUILDXX) -std=gnu++14 \ - -I$(shell $(LLVM_CONFIG) --includedir) \ - -L$(shell $(LLVM_CONFIG) --libdir) \ -- -Wl,--start-group -lclangBasic -lclangDriver \ -- -lclangFrontend -lclangEdit -lclangLex \ -- -lclangAST -Wl,--end-group \ -- $(shell $(LLVM_CONFIG) --libs Core option) \ -+ -lclang-cpp $(shell $(LLVM_CONFIG) --libs) \ - $(shell $(LLVM_CONFIG) --system-libs) \ - > $(@:.bin=.make.output) 2>&1 - ---- a/tools/perf/Makefile.perf -+++ b/tools/perf/Makefile.perf -@@ -417,14 +417,11 @@ EXTLIBS := $(call filter-out,$(EXCLUDE_EXTLIBS),$(EXTLIBS)) - LIBS = -Wl,--whole-archive $(PERFLIBS) $(EXTRA_PERFLIBS) -Wl,--no-whole-archive -Wl,--start-group $(EXTLIBS) -Wl,--end-group - - ifeq ($(USE_CLANG), 1) -- CLANGLIBS_LIST = AST Basic CodeGen Driver Frontend Lex Tooling Edit Sema Analysis Parse Serialization -- CLANGLIBS_NOEXT_LIST = $(foreach l,$(CLANGLIBS_LIST),$(shell $(LLVM_CONFIG) --libdir)/libclang$(l)) -- LIBCLANG = $(foreach l,$(CLANGLIBS_NOEXT_LIST),$(wildcard $(l).a $(l).so)) -- LIBS += -Wl,--start-group $(LIBCLANG) -Wl,--end-group -+ LIBS += -lclang-cpp - endif - - ifeq ($(USE_LLVM), 1) -- LIBLLVM = $(shell $(LLVM_CONFIG) --libs all) $(shell $(LLVM_CONFIG) --system-libs) -+ LIBLLVM = $(shell $(LLVM_CONFIG) --libs) $(shell $(LLVM_CONFIG) --system-libs) - LIBS += -L$(shell $(LLVM_CONFIG) --libdir) $(LIBLLVM) - endif - diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-6.4-libtracefs.patch b/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-6.4-libtracefs.patch new file mode 100644 index 0000000000..e02e2db966 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-6.4-libtracefs.patch @@ -0,0 +1,23 @@ +Let perf find libtraceevent headers when detecting libtracefs + +--- a/tools/build/feature/test-libtracefs.c ++++ b/tools/build/feature/test-libtracefs.c +@@ -1,5 +1,5 @@ + // SPDX-License-Identifier: GPL-2.0 +-#include ++#include + + int main(void) + { +--- a/tools/perf/Makefile.config ++++ b/tools/perf/Makefile.config +@@ -185,6 +185,9 @@ endif + FEATURE_CHECK_CFLAGS-libbabeltrace := $(LIBBABELTRACE_CFLAGS) + FEATURE_CHECK_LDFLAGS-libbabeltrace := $(LIBBABELTRACE_LDFLAGS) -lbabeltrace-ctf + ++FEATURE_CHECK_CFLAGS-libtracefs := $(shell $(PKG_CONFIG) --cflags libtracefs) ++FEATURE_CHECK_LDFLAGS-libtracefs := $(shell $(PKG_CONFIG) --libs libtracefs) ++ + ifdef LIBZSTD_DIR + LIBZSTD_CFLAGS := -I$(LIBZSTD_DIR)/lib + LIBZSTD_LDFLAGS := -L$(LIBZSTD_DIR)/lib diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/perf/metadata.xml index a363827ff1..b249668f8c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-util/perf/metadata.xml @@ -1,6 +1,10 @@ + + amadio@gentoo.org + Guilherme Amadio + naota@gentoo.org Naohiro Aota @@ -9,11 +13,8 @@ dlan@gentoo.org Yixun Lan - - amadio@gentoo.org - Guilherme Amadio - + Enable support for eBPF features with dev-libs/libbpf Enable dev-util/babeltrace support Enable builtin clang and LLVM support @@ -24,6 +25,8 @@ systems. Enable dev-libs/libpfm support + Enable dev-libs/libtraceevent support + Enable dev-libs/libtracefs support Enable NUMA support Add support for Perl as a scripting language for perf tools. diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.19-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.19-r1.ebuild deleted file mode 100644 index da0f5c7509..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.19-r1.ebuild +++ /dev/null @@ -1,274 +0,0 @@ -# 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="" - 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}" - -# 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}"/${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 - 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 -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.0-r1.ebuild deleted file mode 100644 index c1abe01f17..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.0-r1.ebuild +++ /dev/null @@ -1,269 +0,0 @@ -# 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} - >=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}"/${P}-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 -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.3-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.3-r1.ebuild index eb28c4419c..d519238f14 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.3-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.3.ebuild index 31bad3f7e7..8f0ac9a76c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.4-r1.ebuild similarity index 69% rename from sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.2-r1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.4-r1.ebuild index 8c07d2f59d..a1a140af0e 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.2-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.4-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) -inherit bash-completion-r1 estack llvm toolchain-funcs python-r1 linux-info +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/" @@ -31,10 +31,13 @@ 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" +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="${PYTHON_REQUIRED_USE}" +REQUIRED_USE=" + bpf? ( clang ) + ${PYTHON_REQUIRED_USE} +" # setuptools (and Python) are always needed even if not building Python bindings BDEPEND=" @@ -53,27 +56,38 @@ BDEPEND=" ) " -RDEPEND="audit? ( sys-process/audit ) +RDEPEND=" + audit? ( sys-process/audit ) babeltrace? ( dev-util/babeltrace ) - crypt? ( virtual/libcrypt:= ) + 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 ) + 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 ) - unwind? ( sys-libs/libunwind ) - zlib? ( sys-libs/zlib ) - zstd? ( app-arch/zstd ) + tcmalloc? ( dev-util/google-perftools ) + unwind? ( sys-libs/libunwind:= ) + zstd? ( app-arch/zstd:= ) dev-libs/elfutils - sys-libs/binutils-libs:=" + sys-libs/binutils-libs:= + sys-libs/zlib +" DEPEND="${RDEPEND} >=sys-kernel/linux-headers-5.10 @@ -83,7 +97,19 @@ DEPEND="${RDEPEND} S_K="${WORKDIR}/linux-${LINUX_VER}" S="${S_K}/tools/perf" -CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS" +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 @@ -103,13 +129,19 @@ 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=( - tools/arch tools/build tools/include tools/lib tools/perf tools/scripts + kernel/bpf tools/{arch,bpf,build,include,lib,perf,scripts} scripts include lib "arch/*/lib" ) @@ -147,6 +179,7 @@ src_prepare() { 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 @@ -167,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, @@ -181,49 +214,60 @@ 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}" + 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