From e03cdd3294292be6e2e214bdf9aeb7388948cb66 Mon Sep 17 00:00:00 2001
From: Upgrade Helper <auh@yoctoproject.org>
Date: Tue, 15 Jul 2025 09:15:02 +0000
Subject: [PATCH] debugedit: upgrade 5.1 -> 5.2

---
 .../{debugedit_5.1.bb => debugedit_5.2.bb}    |  3 +-
 ...on-to-allow-disabling-inlined-xxhash.patch | 81 -------------------
 ...003-Makefile.am-do-not-update-manual.patch |  6 +-
 3 files changed, 4 insertions(+), 86 deletions(-)
 rename meta/recipes-devtools/debugedit/{debugedit_5.1.bb => debugedit_5.2.bb} (87%)
 delete mode 100644 meta/recipes-devtools/debugedit/files/0001-Add-option-to-allow-disabling-inlined-xxhash.patch

diff --git a/meta/recipes-devtools/debugedit/debugedit_5.1.bb b/meta/recipes-devtools/debugedit/debugedit_5.2.bb
similarity index 87%
rename from meta/recipes-devtools/debugedit/debugedit_5.1.bb
rename to meta/recipes-devtools/debugedit/debugedit_5.2.bb
index 384909a36f..76c54ba63d 100644
--- a/meta/recipes-devtools/debugedit/debugedit_5.1.bb
+++ b/meta/recipes-devtools/debugedit/debugedit_5.2.bb
@@ -10,11 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
                     file://COPYING3;md5=d32239bcb673463ab874e80d47fae504"
 
 SRC_URI = "https://sourceware.org/ftp/debugedit/${PV}/debugedit-${PV}.tar.xz \
-           file://0001-Add-option-to-allow-disabling-inlined-xxhash.patch \
            file://0003-Makefile.am-do-not-update-manual.patch \
            "
 
-SRC_URI[sha256sum] = "ee9b688b2ed8fa62551c54cb5dc31aaa05853e7dedbd9e1237c77894ea5e3626"
+SRC_URI[sha256sum] = "705296803cc4403f38764e891b4ed38f8d8d4f8a9164bd4f86c9d4bedcac68dd"
 
 DEPENDS = "elfutils xxhash"
 DEPENDS:append:libc-musl = " musl-legacy-error"
diff --git a/meta/recipes-devtools/debugedit/files/0001-Add-option-to-allow-disabling-inlined-xxhash.patch b/meta/recipes-devtools/debugedit/files/0001-Add-option-to-allow-disabling-inlined-xxhash.patch
deleted file mode 100644
index 3aac43628b..0000000000
--- a/meta/recipes-devtools/debugedit/files/0001-Add-option-to-allow-disabling-inlined-xxhash.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 820498e881401a6f4b1715dc6831da965f6e1d69 Mon Sep 17 00:00:00 2001
-From: Chen Qi <Qi.Chen@windriver.com>
-Date: Tue, 18 Feb 2025 18:50:46 -0800
-Subject: [PATCH] Add option to allow disabling inlined xxhash
-
-xxhash cannot always inline. For example, when using gcc14 and
-'-Og' option, xxhash cannot inline. See links below:
-https://github.com/Cyan4973/xxHash/commit/574aabad87b2ab9440403e92e1075ef48554eb87
-https://github.com/Cyan4973/xxHash/issues/943#issuecomment-2563205130
-
-To allow users successfully build debugedit with gcc14 and "-Og" option,
-add an option to allow disabling inlined xxhash.
-
-This patch refers to a similar patch for libabigail:
-https://sourceware.org/cgit/libabigail/commit/?id=50497911e2590c21270e0763d277457cf7752c3f
-
-Note that the default remains using inlined xxhash.
-
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
-
-Upstream-Status: Backport [https://sourceware.org/cgit/debugedit/commit/?id=820498e881401a6f4b1715dc6831da965f6e1d69]
-
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
----
- Makefile.am       |  4 ++--
- configure.ac      | 11 +++++++++++
- tools/debugedit.c |  1 -
- 3 files changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index c590edf..35fd947 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -42,8 +42,8 @@ find-debuginfo: $(top_srcdir)/scripts/find-debuginfo.in Makefile
- 
- debugedit_SOURCES = tools/debugedit.c \
- 		    tools/hashtab.c 
--debugedit_CFLAGS = @LIBELF_CFLAGS@ @LIBDW_CFLAGS@ $(AM_CFLAGS)
--debugedit_LDADD = @LIBELF_LIBS@ @LIBDW_LIBS@
-+debugedit_CFLAGS = @LIBELF_CFLAGS@ @LIBDW_CFLAGS@ @XXHASH_CFLAGS@ $(AM_CFLAGS)
-+debugedit_LDADD = @LIBELF_LIBS@ @LIBDW_LIBS@ @XXHASH_LIBS@
- 
- sepdebugcrcfix_SOURCES = tools/sepdebugcrcfix.c
- sepdebugcrcfix_CFLAGS = @LIBELF_CFLAGS@ $(AM_CFLAGS)
-diff --git a/configure.ac b/configure.ac
-index a5a6e28..32dd27d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -181,6 +181,17 @@ else
- fi
- AC_SUBST([READELF_VERSION_OK])
- 
-+ENABLE_INLINED_XXHASH=yes
-+AC_ARG_ENABLE(inlined-xxhash,
-+	AS_HELP_STRING([--disable-inlined-xxhash], [disable the inlined-only version of xxhash library]),
-+	ENABLE_INLINED_XXHASH=$enableval,
-+	ENABLE_INLINED_XXHASH=yes)
-+
-+if test x$ENABLE_INLINED_XXHASH = xyes; then
-+	XXHASH_CFLAGS="$XXHASH_CFLAGS -DXXH_INLINE_ALL"
-+	XXHASH_LIBS=""
-+fi
-+
- # And generate the output files.
- AC_CONFIG_FILES([Makefile])
- AC_OUTPUT
-diff --git a/tools/debugedit.c b/tools/debugedit.c
-index beefd65..43f9cee 100644
---- a/tools/debugedit.c
-+++ b/tools/debugedit.c
-@@ -82,7 +82,6 @@ typedef struct Ebl_Strtab	Strtab;
- 
- #include "tools/hashtab.h"
- 
--#define XXH_INLINE_ALL
- #include "xxhash.h"
- 
- #define DW_TAG_partial_unit 0x3c
--- 
-2.25.1
-
diff --git a/meta/recipes-devtools/debugedit/files/0003-Makefile.am-do-not-update-manual.patch b/meta/recipes-devtools/debugedit/files/0003-Makefile.am-do-not-update-manual.patch
index d0414f739a..e57ffdb387 100644
--- a/meta/recipes-devtools/debugedit/files/0003-Makefile.am-do-not-update-manual.patch
+++ b/meta/recipes-devtools/debugedit/files/0003-Makefile.am-do-not-update-manual.patch
@@ -1,4 +1,4 @@
-From b2715c3f4d28fab1c238086d9b5435e269b06301 Mon Sep 17 00:00:00 2001
+From b12dab2cfad277a539e6a8f1efb5e40163516183 Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Thu, 23 Mar 2023 13:09:23 +0800
 Subject: [PATCH] Makefile.am: do not update manual
@@ -20,10 +20,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
  1 file changed, 30 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index c590edf..692e016 100644
+index 99555bd..2635da5 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -52,36 +52,6 @@ sepdebugcrcfix_LDADD = @LIBELF_LIBS@
+@@ -55,36 +55,6 @@ sepdebugcrcfix_LDADD = @LIBELF_LIBS@
  # Manual pages are generated for dist
  dist_man_MANS = debugedit.1 sepdebugcrcfix.1 find-debuginfo.1
  
-- 
2.47.1

