fix buildid patch.

diff --git a/debian/patches/perf-avoid-binutils-buildid.patch b/debian/patches/perf-avoid-binutils-buildid.patch
index 0114155a1d9e2ba26a1a6d53f33f203246cb8497..6d1fad157303971f69f3c33f08e945cc1a7e0c53 100644 (file)
--- 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 <plugwash@raspbian.org>
 
-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 7613f1475b75c5bc3258c3709eeb91e70a11752c..4abcf5bf0793c6de0d263aa4f99a99e02ce48d84 100644 (file)
--- 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)
 {