summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuilherme Amadio <amadio@gentoo.org>2024-10-04 17:05:06 +0200
committerGuilherme Amadio <amadio@gentoo.org>2024-10-04 17:07:31 +0200
commit082517b39188d4ac99b349cc7367e1653194b513 (patch)
tree9bfcffaf78fbe2e343c962be2de751a87de0eac4 /dev-util/perf
parentdev-util/perf: add 6.11 (diff)
downloadgentoo-082517b39188d4ac99b349cc7367e1653194b513.tar.gz
gentoo-082517b39188d4ac99b349cc7367e1653194b513.tar.bz2
gentoo-082517b39188d4ac99b349cc7367e1653194b513.zip
dev-util/perf: drop 6.3
Signed-off-by: Guilherme Amadio <amadio@gentoo.org>
Diffstat (limited to 'dev-util/perf')
-rw-r--r--dev-util/perf/Manifest1
-rw-r--r--dev-util/perf/files/perf-6.0-c++17.patch39
-rw-r--r--dev-util/perf/files/perf-6.0-clang.patch44
-rw-r--r--dev-util/perf/metadata.xml1
-rw-r--r--dev-util/perf/perf-6.3.ebuild284
5 files changed, 0 insertions, 369 deletions
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 13b16a36b71d..e2bc9f93960b 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,5 +1,4 @@
DIST linux-6.10.tar.xz 145142812 BLAKE2B bb243ea7493b9d63aa2df2050a3f1ae2b89ee84a20015239cf157e3f4f51c7ac5efedc8a51132b2d7482f9276ac418de6624831c8a3b806130d9c2d2124c539b SHA512 baa2487954044f991d2ae254d77d14a1f0185dd62c9f0fcaff69f586c9f906823017b8db1c4588f27b076dfa3ebb606929fec859f60ea419e7974330b9289cc2
DIST linux-6.11.tar.xz 146900704 BLAKE2B e7750c0878d71a56a0ce52d4c4c912199dad5bf5e2e8f872585a6494afbb37cbd852e612a6858936d2dc9b7776a3933818f540db408d57e90d18ea5249bba7ab SHA512 329c1f94008742e3f0c2ce7e591a16316d1b2cb9ea4596d4f45604097e07b7aa2f64afa40630a07f321a858455c77aa32ba57b271932ddcf4dc27863f9081cea
-DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
DIST linux-6.7.tar.xz 141406528 BLAKE2B cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e SHA512 de06de556191614bd9daf077ae239360352a402bab407748e67f1e5108c92fd933e451707840ab22fe0f9976db3d1e1b60ca9d41cf894f015ca09b3f652b74ad
DIST patch-6.10.4.xz 303168 BLAKE2B d38bbcdd2f730a030add5b38c1ab09c7081c311ed716d3ae976a058dd34b235078700cdff05d79dc93d9badb75c95566a3bdfc39dfa045d54857d82ee2c92e9d SHA512 5f5e8b19d114fed733c8c98a581fe339f8896e05e5da6a37deb1d7d8aa9dd83b3c80a97b1c6f3f51b6f20cca9c435b20c28c2c511da2026980d9fa72624cf420
diff --git a/dev-util/perf/files/perf-6.0-c++17.patch b/dev-util/perf/files/perf-6.0-c++17.patch
deleted file mode 100644
index 08c34bc552ca..000000000000
--- a/dev-util/perf/files/perf-6.0-c++17.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://bugs.gentoo.org/904169
---- a/tools/perf/Makefile.config
-+++ b/tools/perf/Makefile.config
-@@ -309,7 +309,7 @@
- CORE_CFLAGS += -Wextra
- CORE_CFLAGS += -std=gnu11
-
--CXXFLAGS += -std=gnu++14 -fno-exceptions -fno-rtti
-+CXXFLAGS += -std=gnu++17 -fno-exceptions -fno-rtti
- CXXFLAGS += -Wall
- CXXFLAGS += -fno-omit-frame-pointer
- CXXFLAGS += -ggdb3
---- a/tools/build/feature/Makefile
-+++ b/tools/build/feature/Makefile
-@@ -339,7 +339,7 @@
- $(BUILD)
-
- $(OUTPUT)test-llvm.bin:
-- $(BUILDXX) -std=gnu++14 \
-+ $(BUILDXX) -std=gnu++17 \
- -I$(shell $(LLVM_CONFIG) --includedir) \
- -L$(shell $(LLVM_CONFIG) --libdir) \
- $(shell $(LLVM_CONFIG) --libs) \
-@@ -347,12 +347,12 @@
- > $(@:.bin=.make.output) 2>&1
-
- $(OUTPUT)test-llvm-version.bin:
-- $(BUILDXX) -std=gnu++14 \
-+ $(BUILDXX) -std=gnu++17 \
- -I$(shell $(LLVM_CONFIG) --includedir) \
- > $(@:.bin=.make.output) 2>&1
-
- $(OUTPUT)test-clang.bin:
-- $(BUILDXX) -std=gnu++14 \
-+ $(BUILDXX) -std=gnu++17 \
- -I$(shell $(LLVM_CONFIG) --includedir) \
- -L$(shell $(LLVM_CONFIG) --libdir) \
- -lclang-cpp $(shell $(LLVM_CONFIG) --libs) \
-
diff --git a/dev-util/perf/files/perf-6.0-clang.patch b/dev-util/perf/files/perf-6.0-clang.patch
deleted file mode 100644
index 65b38c8d399b..000000000000
--- a/dev-util/perf/files/perf-6.0-clang.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-
-Adapt for building against LLVM/Clang with monolithic libraries.
-
---- a/tools/build/feature/Makefile
-+++ b/tools/build/feature/Makefile
-@@ -338,7 +338,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
-
-@@ -351,10 +351,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
-@@ -416,14 +416,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/dev-util/perf/metadata.xml b/dev-util/perf/metadata.xml
index 89fef8ad07ac..2a4e4eada619 100644
--- a/dev-util/perf/metadata.xml
+++ b/dev-util/perf/metadata.xml
@@ -17,7 +17,6 @@
<flag name="bpf">Enable support for eBPF features with <pkg>dev-libs/libbpf</pkg></flag>
<flag name="babeltrace">Enable <pkg>dev-util/babeltrace</pkg> support</flag>
<flag name="capstone">Use <pkg>dev-libs/capstone</pkg> for disassembly support</flag>
- <flag name="clang">Enable builtin clang and LLVM support</flag>
<flag name="doc">
Build documentation and man pages. With this USE flag disabled,
the --help parameter for perf and its sub-tools will not be
diff --git a/dev-util/perf/perf-6.3.ebuild b/dev-util/perf/perf-6.3.ebuild
deleted file mode 100644
index 9d36b0ce8ca7..000000000000
--- a/dev-util/perf/perf-6.3.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..11} )
-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/"
-
-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}
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 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}]
- app-alternatives/yacc
- app-alternatives/lex
- 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-debug/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 )
-"
-
-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}"/perf-6.0-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"
-
- # 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)" \
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" NM="$(tc-getNM)" \
- CLANG="${CHOST}-clang" \
- 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="${disable_libdw}" \
- 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() {
- 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
- 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
-}