From 69f52af7c3719e375c388853b10f5c6ce9977f8d Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Sat, 24 Jan 2026 11:28:04 +0000 Subject: [PATCH] fix buildid patch. --- .../patches/perf-avoid-binutils-buildid.patch | 31 +++++-------------- tools/perf/util/symbol-elf.c | 7 +++-- 2 files changed, 11 insertions(+), 27 deletions(-) diff --git a/debian/patches/perf-avoid-binutils-buildid.patch b/debian/patches/perf-avoid-binutils-buildid.patch index 0114155a1d9..6d1fad15730 100644 --- a/debian/patches/perf-avoid-binutils-buildid.patch +++ b/debian/patches/perf-avoid-binutils-buildid.patch @@ -1,34 +1,17 @@ Description: Disable libbfd buildid support, it seems to fail to build. Author: Peter Michael Green -diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c -index 1346fd18065..7613f1475b7 100644 ---- a/tools/perf/util/symbol-elf.c -+++ b/tools/perf/util/symbol-elf.c -@@ -871,7 +871,7 @@ static int elf_read_build_id(Elf *elf, void *bf, size_t size) +Index: linux-6.17.13/tools/perf/util/symbol-elf.c +=================================================================== +--- linux-6.17.13.orig/tools/perf/util/symbol-elf.c ++++ linux-6.17.13/tools/perf/util/symbol-elf.c +@@ -871,7 +871,8 @@ out: return err; } -#ifdef HAVE_LIBBFD_BUILDID_SUPPORT -+/*#ifdef HAVE_LIBBFD_BUILDID_SUPPORT ++//*#ifdef HAVE_LIBBFD_BUILDID_SUPPORT ++#if 0 static int read_build_id(const char *filename, struct build_id *bid, bool block) { -@@ -904,7 +904,7 @@ static int read_build_id(const char *filename, struct build_id *bid, bool block) - return err; - } - --#else // HAVE_LIBBFD_BUILDID_SUPPORT -+#else // HAVE_LIBBFD_BUILDID_SUPPORT */ - - static int read_build_id(const char *filename, struct build_id *bid, bool block) - { -@@ -936,7 +936,7 @@ static int read_build_id(const char *filename, struct build_id *bid, bool block) - return err; - } - --#endif // HAVE_LIBBFD_BUILDID_SUPPORT -+//#endif // HAVE_LIBBFD_BUILDID_SUPPORT - - int filename__read_build_id(const char *filename, struct build_id *bid, bool block) - { diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c index 7613f1475b7..4abcf5bf079 100644 --- a/tools/perf/util/symbol-elf.c +++ b/tools/perf/util/symbol-elf.c @@ -871,7 +871,8 @@ out: return err; } -/*#ifdef HAVE_LIBBFD_BUILDID_SUPPORT +//*#ifdef HAVE_LIBBFD_BUILDID_SUPPORT +#if 0 static int read_build_id(const char *filename, struct build_id *bid, bool block) { @@ -904,7 +905,7 @@ out_close: return err; } -#else // HAVE_LIBBFD_BUILDID_SUPPORT */ +#else // HAVE_LIBBFD_BUILDID_SUPPORT static int read_build_id(const char *filename, struct build_id *bid, bool block) { @@ -936,7 +937,7 @@ out: return err; } -//#endif // HAVE_LIBBFD_BUILDID_SUPPORT +#endif // HAVE_LIBBFD_BUILDID_SUPPORT int filename__read_build_id(const char *filename, struct build_id *bid, bool block) { -- 2.30.2