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 2b586b7e41..574328166e 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,3 +1,6 @@ -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 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/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.17.1-clang.patch b/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.17.1-clang.patch new file mode 100644 index 0000000000..73d4506146 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.17.1-clang.patch @@ -0,0 +1,61 @@ + +Fix building against LLVM/Clang with monolithic libraries and +adjust header includes for Clang >= 14. + +--- 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 + +--- a/tools/perf/util/c++/clang.cpp ++++ b/tools/perf/util/c++/clang.cpp +@@ -20,7 +20,11 @@ + #include "llvm/Option/Option.h" + #include "llvm/Support/FileSystem.h" + #include "llvm/Support/ManagedStatic.h" ++#if CLANG_VERSION_MAJOR >= 14 ++#include "llvm/MC/TargetRegistry.h" ++#else + #include "llvm/Support/TargetRegistry.h" ++#endif + #include "llvm/Support/TargetSelect.h" + #include "llvm/Target/TargetMachine.h" + #include "llvm/Target/TargetOptions.h" + 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 new file mode 100644 index 0000000000..d1c9a48e68 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.18-clang.patch @@ -0,0 +1,45 @@ + +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/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/perf/metadata.xml index 3d3ce6d908..5ebbfb8b49 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 @@ -3,6 +3,7 @@ naota@gentoo.org + Naohiro Aota dlan@gentoo.org @@ -19,12 +20,6 @@ Enable dev-util/babeltrace support Enable builtin clang and LLVM support - - Enable C++ symbol name demangling, using libbfd from - sys-devel/binutils. When this flag is enabled, the - package will have to be rebuilt after every version bump of - binutils. - Build documentation and man pages. With this USE flag disabled, the --help parameter for perf and its sub-tools will not be @@ -41,7 +36,7 @@ Add support to define SDT event in perf tools. - Use sys-libs/libunwind for frame unwinding support. + Use sys-libs/libunwind for frame unwinding support. diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.15-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.15-r1.ebuild index 601dc13c9a..9f1e523876 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.15-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.15-r1.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -# Flatcar: Support python 3.6. -PYTHON_COMPAT=( python3_{6..10} ) -inherit bash-completion-r1 estack llvm toolchain-funcs prefix python-r1 linux-info +PYTHON_COMPAT=( python3_{7..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/" @@ -32,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}" @@ -55,8 +54,8 @@ RDEPEND="audit? ( sys-process/audit ) babeltrace? ( dev-util/babeltrace ) crypt? ( virtual/libcrypt:= ) clang? ( - sys-devel/clang:= - sys-devel/llvm:= + /dev/null || die + eapply "${FILESDIR}"/${P}-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):" \ + -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 @@ -156,11 +160,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; } @@ -222,9 +221,7 @@ perf_make() { 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 + 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 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.8.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.18.ebuild similarity index 70% rename from sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.8.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.18.ebuild index 38ceee391a..773d205044 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.8.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.18.ebuild @@ -1,13 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 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}" +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/" @@ -34,20 +31,35 @@ 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} )" +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 ) - crypt? ( dev-libs/openssl:0= ) + babeltrace? ( dev-util/babeltrace ) + crypt? ( virtual/libcrypt:= ) clang? ( - =sys-kernel/linux-headers-4.19 - ${LINUX_PATCH+dev-util/patchutils} - sys-devel/bison - sys-devel/flex - virtual/pkgconfig + >=sys-kernel/linux-headers-5.10 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 +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 @@ -117,25 +141,25 @@ src_prepare() { popd || die fi + pushd "${S_K}" >/dev/null || die + eapply "${FILESDIR}"/${P}-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):" \ + -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 - echo "#define PERF_VERSION \"${MY_PV}\"" > PERF-VERSION-FILE + 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; } @@ -150,39 +174,43 @@ perf_make() { local arch=$(tc-arch-kernel) local java_dir - use java && java_dir="/etc/java-config-2/current-system-vm" + 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}" \ + 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=$(puse demangle) \ - NO_GTK2=$(puse gtk) \ + NO_DEMANGLE= \ + GTK2=$(usex gtk 1 "") \ + 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_LIBBPF= \ NO_LIBCRYPTO=$(puse crypt) \ - NO_LIBDW_DWARF_UNWIND="" \ - NO_LIBELF="" \ + 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= \ + NO_ZLIB=$(puse zlib) \ WERROR=0 \ LIBDIR="/usr/libexec/perf-core" \ libdir="${EPREFIX}/usr/$(get_libdir)" \ @@ -193,12 +221,10 @@ perf_make() { 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 + 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 + use doc && perf_make -C Documentation man } src_test() { @@ -211,12 +237,11 @@ src_install() { } 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)" @@ -229,16 +254,11 @@ src_install() { 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 } - -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/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.19.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.19.ebuild new file mode 100644 index 0000000000..c0b17711b7 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.19.ebuild @@ -0,0 +1,271 @@ +# 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 + # 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 +}