From d8d00062a674001a220894352bf37f93582b25c1 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 1 Jan 2024 07:12:18 +0000 Subject: [PATCH] dev-util/perf: Sync with Gentoo It's from Gentoo commit 28ab25b2e1c8c856a062ca27b336124a43ec167f. --- .../dev-util/perf/perf-6.3.ebuild | 15 +++++++++++++- .../dev-util/perf/perf-6.5.ebuild | 16 ++++++++++++++- .../dev-util/perf/perf-6.6.ebuild | 20 ++++++++++++++++--- 3 files changed, 46 insertions(+), 5 deletions(-) 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 7969607f79..e3f009470d 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 @@ -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/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.5.ebuild index 63a36103e1..128f4fd8b6 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.6.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.6.ebuild index 4a55d5dfd7..5f93ba5de3 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.6.ebuild +++ b/sdk_container/src/third_party/portage-stable/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=" @@ -88,7 +88,7 @@ RDEPEND=" " DEPEND="${RDEPEND} - >=sys-kernel/linux-headers-6.6 + >=sys-kernel/linux-headers-5.10 java? ( virtual/jdk ) " @@ -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)