From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- dev-util/perf/Manifest | 5 + dev-util/perf/files/perf-5.4.6-fix-clang9.patch | 17 ++ .../perf/files/perf-5.4.7-propagate-cflags.patch | 44 ++++ dev-util/perf/perf-5.4.7.ebuild | 245 +++++++++++++++++++++ 4 files changed, 311 insertions(+) create mode 100644 dev-util/perf/files/perf-5.4.6-fix-clang9.patch create mode 100644 dev-util/perf/files/perf-5.4.7-propagate-cflags.patch create mode 100644 dev-util/perf/perf-5.4.7.ebuild (limited to 'dev-util/perf') diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest index ed15c39bc4e3..0f4f5f18292f 100644 --- a/dev-util/perf/Manifest +++ b/dev-util/perf/Manifest @@ -1,11 +1,16 @@ AUX perf-5.1.15-fix-clang8.patch 659 BLAKE2B 5f68efedb5dfe092116db7cb1a0586dbefbd40d8f6d3cac00a8a5ef33d0f94f99dfb06ea70a7df5b81e1917c8d5f82e63d76c118b6c386f0c228ae5bc20a7b2f SHA512 66bae97bcd73cf9fe5bc68e843cb46921511bafc8671e0cd058b1493e83fccd41b786ab5b45f8fe3f3cfccefe3b6bd209e66533fc9331853484e212b0207bf98 +AUX perf-5.4.6-fix-clang9.patch 558 BLAKE2B 001bde226595891626dc7b46ece6de240696bbfb7e5071e4f071653f90e3b98a032ed375b0ec4a3f88795c20b8066954e8934fc4c38f8814c0349c6037d60a1a SHA512 af1c82863b2e7e9d87199896765646622d8431fac7a80b7579fb88ca83df182493996b61033618632a9b11ca6c87e4400cf14506ade9b00d327ed2cf644e1945 +AUX perf-5.4.7-propagate-cflags.patch 1502 BLAKE2B d35f94d10ecc2d384cae9084a7f843581553682bd1ec66e7dd33d0fe110e03c01761b9b2472aa637a71f5c694f4c4eb10691afefb08351e06ea607ca4a460248 SHA512 a5506e118f75439386b3c7699197b20017ef819669b06d89ed79886146e7a79d52d1397680cc94e10137bd6665d3dc2812cb1556498de2739f4d967582522a80 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 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.7.xz 272092 BLAKE2B dc9e1cede993144a4d9cb17cb91d3857b6492fa1a971c743268afdc601edfafb033abc3ac24cb7789d3f171ea7fb6b60ad5197da445ab72f5e9cf2ae00e7f495 SHA512 396eaf9fe88045e6e308cbe8e72217b3334b637bfa7e85f8d27cc4dd8e3d94c6f58d2b7b3e237defcf647d500610b85780ec2e21f1d91ac41c5f4ef3e74dc161 EBUILD perf-4.14.33-r1.ebuild 5052 BLAKE2B 5da35d5037d73c909e15727a9e969d285de0eff5d5b4dcef95ce1e2ebe7d9a13ed8a6f95a713dfa97113a051669abf576722473a65020d832d2b39288136a108 SHA512 34b059d824eed25f6cc2b599866aecc2b74fcd2537826853d992013b9c6eb23ae5f424a6a2f8af93658c0526dfd3235934c62da41a2261164e400244cd966bed EBUILD perf-4.20.3.ebuild 6042 BLAKE2B e1498b914f8b135927f5e97211d5246dab4bfd5bafbcf9ba431c2f8d95cf1568a162d2704f6cf851951178287efdcc6d75391ede09ea101b18d88463a4586912 SHA512 3f45b1edfefd658eaa48b4e4ae02c09e39cd6f2f7235bbb8eb9d90d69028df6d53709dac1790f932c7a20e7e77fad8327867ccdec80f302c0d72958d3c1bb138 EBUILD perf-5.3.7.ebuild 6360 BLAKE2B f3f17e3ba1375c7a2e1e4ae33053318b58344c43fad7c8fdde8b867f4a2d326b201c74260df4438eb2314013d110f6e72488601ffe3f40c0473c8a3de4f080b4 SHA512 87f79ea8c9cd3c5709f6592b7f7ba979cfafe6479809aa3f59ca45d35fc4b2f4b2532fdc4e4c49b903a9a647dfabb93899a7c8c7a7a0a01aafcac54fe3293af3 +EBUILD perf-5.4.7.ebuild 6603 BLAKE2B 337de5593d74f85c0c4595adf493b9932fcff4d5dd727bbbe14f270cfe459383885f6aed194c4fc2f6c31f11b5deaf258acee3932031ad6a6d52e147430af844 SHA512 619a24799a921b3c870b07e3ff395478947bae04da909eb5cad49d9d930566c3add5fabfd9d2c373176dc3e73ae434d5146037aad4f8a2c2fb24af193e345c88 MISC metadata.xml 1245 BLAKE2B 78921a70a2d435eac57471863f5f8f50eaae16049c6085326cc91a82437b42ada7c3a5fa97124a01f5477b02e37fa03212eb65d9652a71b8c8886f99e2986d22 SHA512 99fcebf78438dd22f2ff35846fadd1280e25154dab4a4ab8bf9bc13d911c7450f92234ed2c39d9905d6b138a783af1e20896e0b09e9dd07813baf5da48234ea2 diff --git a/dev-util/perf/files/perf-5.4.6-fix-clang9.patch b/dev-util/perf/files/perf-5.4.6-fix-clang9.patch new file mode 100644 index 000000000000..614e62f676d2 --- /dev/null +++ b/dev-util/perf/files/perf-5.4.6-fix-clang9.patch @@ -0,0 +1,17 @@ +https://bugs.gentoo.org/695726 +Created-By: Maciej S. Szmigiero +Created-By: Dennis Schridde +--- a/tools/perf/util/c++/clang.cpp.orig 2019-12-20 16:39:21.015363866 +0100 ++++ b/tools/perf/util/c++/clang.cpp 2019-12-20 16:40:04.051639185 +0100 +@@ -71,7 +71,11 @@ + CompilerInstance Clang; + Clang.createDiagnostics(); + ++#if CLANG_VERSION_MAJOR < 9 + Clang.setVirtualFileSystem(&*VFS); ++#else ++ Clang.createFileManager(&*VFS); ++#endif + + #if CLANG_VERSION_MAJOR < 4 + IntrusiveRefCntPtr CI = diff --git a/dev-util/perf/files/perf-5.4.7-propagate-cflags.patch b/dev-util/perf/files/perf-5.4.7-propagate-cflags.patch new file mode 100644 index 000000000000..b1a9bcc25a1e --- /dev/null +++ b/dev-util/perf/files/perf-5.4.7-propagate-cflags.patch @@ -0,0 +1,44 @@ +From 55542113c690a567e728e40d4181d7d037fc21b0 Mon Sep 17 00:00:00 2001 +From: Jiri Olsa +Date: Fri, 11 Oct 2019 14:21:55 +0200 +Subject: perf tools: Propagate CFLAGS to libperf + +Andi reported that 'make DEBUG=1' does not propagate to the libbperf +code. It's true also for the other flags. Changing the code to propagate +the global build flags to libperf compilation. + +Reported-by: Andi Kleen +Signed-off-by: Jiri Olsa +Cc: Alexander Shishkin +Cc: Michael Petlan +Cc: Namhyung Kim +Cc: Peter Zijlstra +Link: http://lore.kernel.org/lkml/20191011122155.15738-1-jolsa@kernel.org +Signed-off-by: Arnaldo Carvalho de Melo +--- + tools/perf/lib/core.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +(limited to 'tools/perf/lib/core.c') + +diff --git a/tools/perf/lib/core.c b/tools/perf/lib/core.c +index d0b9ae422b9f..58fc894b76c5 100644 +--- a/tools/perf/lib/core.c ++++ b/tools/perf/lib/core.c +@@ -5,11 +5,12 @@ + #include + #include + #include ++#include + #include + #include + #include "internal.h" + +-static int __base_pr(enum libperf_print_level level, const char *format, ++static int __base_pr(enum libperf_print_level level __maybe_unused, const char *format, + va_list args) + { + return vfprintf(stderr, format, args); +-- +cgit 1.2-0.3.lf.el7 + diff --git a/dev-util/perf/perf-5.4.7.ebuild b/dev-util/perf/perf-5.4.7.ebuild new file mode 100644 index 000000000000..bec92bb4af81 --- /dev/null +++ b/dev-util/perf/perf-5.4.7.ebuild @@ -0,0 +1,245 @@ +# 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 +} -- cgit v1.2.3