commit: 97e69b5219032d490087c65d62e481cb5555b1bf Author: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> AuthorDate: Thu Dec 4 18:19:24 2025 +0000 Commit: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> CommitDate: Thu Dec 4 18:25:20 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e69b52
dev-util/perf: remove unused patches Signed-off-by: Michael Mair-Keimberger <mm1ke <AT> gentoo.org> dev-util/perf/files/perf-6.11.7-annotate.patch | 19 ------------------- dev-util/perf/files/perf-6.4-libtracefs.patch | 23 ----------------------- dev-util/perf/files/perf-6.7-expr.patch | 24 ------------------------ 3 files changed, 66 deletions(-) diff --git a/dev-util/perf/files/perf-6.11.7-annotate.patch b/dev-util/perf/files/perf-6.11.7-annotate.patch deleted file mode 100644 index ca6e7bb07cba..000000000000 --- a/dev-util/perf/files/perf-6.11.7-annotate.patch +++ /dev/null @@ -1,19 +0,0 @@ - -Fix for bug #943203. - -https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=5363c306787c88d41a41493f81b4308643696f6e - -diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c -index a18927d792afc5..3bbf173ad822bc 100644 ---- a/tools/perf/util/symbol.c -+++ b/tools/perf/util/symbol.c -@@ -1931,6 +1931,9 @@ int dso__load(struct dso *dso, struct map *map) - if (next_slot) { - ss_pos++; - -+ if (dso__binary_type(dso) == DSO_BINARY_TYPE__NOT_FOUND) -+ dso__set_binary_type(dso, symtab_type); -+ - if (syms_ss && runtime_ss) - break; - } else { diff --git a/dev-util/perf/files/perf-6.4-libtracefs.patch b/dev-util/perf/files/perf-6.4-libtracefs.patch deleted file mode 100644 index e02e2db96677..000000000000 --- a/dev-util/perf/files/perf-6.4-libtracefs.patch +++ /dev/null @@ -1,23 +0,0 @@ -Let perf find libtraceevent headers when detecting libtracefs - ---- a/tools/build/feature/test-libtracefs.c -+++ b/tools/build/feature/test-libtracefs.c -@@ -1,5 +1,5 @@ - // SPDX-License-Identifier: GPL-2.0 --#include <tracefs/tracefs.h> -+#include <tracefs.h> - - int main(void) - { ---- a/tools/perf/Makefile.config -+++ b/tools/perf/Makefile.config -@@ -185,6 +185,9 @@ endif - FEATURE_CHECK_CFLAGS-libbabeltrace := $(LIBBABELTRACE_CFLAGS) - FEATURE_CHECK_LDFLAGS-libbabeltrace := $(LIBBABELTRACE_LDFLAGS) -lbabeltrace-ctf - -+FEATURE_CHECK_CFLAGS-libtracefs := $(shell $(PKG_CONFIG) --cflags libtracefs) -+FEATURE_CHECK_LDFLAGS-libtracefs := $(shell $(PKG_CONFIG) --libs libtracefs) -+ - ifdef LIBZSTD_DIR - LIBZSTD_CFLAGS := -I$(LIBZSTD_DIR)/lib - LIBZSTD_LDFLAGS := -L$(LIBZSTD_DIR)/lib diff --git a/dev-util/perf/files/perf-6.7-expr.patch b/dev-util/perf/files/perf-6.7-expr.patch deleted file mode 100644 index 84f90c9b9008..000000000000 --- a/dev-util/perf/files/perf-6.7-expr.patch +++ /dev/null @@ -1,24 +0,0 @@ -Ensure versions of libtraceevent and libtracefs have 3 components. - -Fixes: https://bugs.gentoo.org/917559 - ---- a/tools/perf/Makefile.config -+++ b/tools/perf/Makefile.config -@@ -1163,7 +1163,7 @@ ifneq ($(NO_LIBTRACEEVENT),1) - ifeq ($(feature-libtraceevent), 1) - CFLAGS += -DHAVE_LIBTRACEEVENT - EXTLIBS += -ltraceevent -- LIBTRACEEVENT_VERSION := $(shell $(PKG_CONFIG) --modversion libtraceevent) -+ LIBTRACEEVENT_VERSION := $(shell $(PKG_CONFIG) --modversion libtraceevent).0 - LIBTRACEEVENT_VERSION_1 := $(word 1, $(subst ., ,$(LIBTRACEEVENT_VERSION))) - LIBTRACEEVENT_VERSION_2 := $(word 2, $(subst ., ,$(LIBTRACEEVENT_VERSION))) - LIBTRACEEVENT_VERSION_3 := $(word 3, $(subst ., ,$(LIBTRACEEVENT_VERSION))) -@@ -1177,7 +1177,7 @@ ifneq ($(NO_LIBTRACEEVENT),1) - $(call feature_check,libtracefs) - ifeq ($(feature-libtracefs), 1) - EXTLIBS += -ltracefs -- LIBTRACEFS_VERSION := $(shell $(PKG_CONFIG) --modversion libtracefs) -+ LIBTRACEFS_VERSION := $(shell $(PKG_CONFIG) --modversion libtracefs).0 - LIBTRACEFS_VERSION_1 := $(word 1, $(subst ., ,$(LIBTRACEFS_VERSION))) - LIBTRACEFS_VERSION_2 := $(word 2, $(subst ., ,$(LIBTRACEFS_VERSION))) - LIBTRACEFS_VERSION_3 := $(word 3, $(subst ., ,$(LIBTRACEFS_VERSION)))
