From 5f8db77d5243918cfd9e5f4439b9b98bf7db03cf Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:12:18 +0000 Subject: [PATCH] dev-util/perf: Sync with Gentoo It's from Gentoo commit 6ef4a840b76f607d38196344e9d2fd19d3142dd4. --- .../dev-util/perf/perf-6.3.ebuild | 6 ++-- .../dev-util/perf/perf-6.5.ebuild | 6 ++-- .../dev-util/perf/perf-6.6.ebuild | 28 +++++++++++++++---- 3 files changed, 29 insertions(+), 11 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 e3f009470d..58d7202c0f 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 @@ -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=7 @@ -41,8 +41,8 @@ BDEPEND=" ${PYTHON_DEPS} >=app-arch/tar-1.34-r2 dev-python/setuptools[${PYTHON_USEDEP}] - sys-devel/bison - sys-devel/flex + app-alternatives/yacc + app-alternatives/lex virtual/pkgconfig doc? ( app-text/asciidoc 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 128f4fd8b6..006893a110 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 @@ -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 @@ -44,8 +44,8 @@ BDEPEND=" ${PYTHON_DEPS} >=app-arch/tar-1.34-r2 dev-python/setuptools[${PYTHON_USEDEP}] - sys-devel/bison - sys-devel/flex + app-alternatives/yacc + app-alternatives/lex virtual/pkgconfig doc? ( app-text/asciidoc 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 5f93ba5de3..b5b413be9a 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 @@ -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} @@ -43,8 +43,8 @@ BDEPEND=" ${PYTHON_DEPS} >=app-arch/tar-1.34-r2 dev-python/setuptools[${PYTHON_USEDEP}] - sys-devel/bison - sys-devel/flex + app-alternatives/yacc + app-alternatives/lex virtual/pkgconfig doc? ( app-text/asciidoc @@ -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}"