diff --git a/meta/recipes-devtools/elfutils/elfutils_0.195.bb b/meta/recipes-devtools/elfutils/elfutils_0.196.bb similarity index 98% rename from meta/recipes-devtools/elfutils/elfutils_0.195.bb rename to meta/recipes-devtools/elfutils/elfutils_0.196.bb index 2093e1e924..e50fec3bcb 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.195.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.196.bb @@ -19,12 +19,11 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ file://ptest.patch \ file://0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch \ file://0001-config-eu.am-do-not-force-Werror.patch \ - file://0001-libelf-Add-libeu-objects-to-libelf.a-static-archive.patch \ " SRC_URI:append:libc-musl = " \ file://0003-musl-utils.patch \ " -SRC_URI[sha256sum] = "37629fdf7f1f3dc2818e138fca2b8094177d6c2d0f701d3bb650a561218dc026" +SRC_URI[sha256sum] = "fd5cc6b77ad6773cac93cb3f415f9318ac3b3455eecf801f6b4a742c4f6c7209" inherit autotools gettext ptest pkgconfig diff --git a/meta/recipes-devtools/elfutils/files/0001-config-eu.am-do-not-force-Werror.patch b/meta/recipes-devtools/elfutils/files/0001-config-eu.am-do-not-force-Werror.patch index 0149c64602..d460f2e58b 100644 --- a/meta/recipes-devtools/elfutils/files/0001-config-eu.am-do-not-force-Werror.patch +++ b/meta/recipes-devtools/elfutils/files/0001-config-eu.am-do-not-force-Werror.patch @@ -1,4 +1,4 @@ -From 5a82f181583e02e19ed739a195801032532474bf Mon Sep 17 00:00:00 2001 +From 975357f7585076a072f61684db20180ef8dd31b7 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 22 Nov 2024 12:50:48 +0100 Subject: [PATCH] config/eu.am: do not force -Werror @@ -13,7 +13,7 @@ Signed-off-by: Alexander Kanavin 1 file changed, 2 deletions(-) diff --git a/config/eu.am b/config/eu.am -index 321591f..a1748a8 100644 +index 4ea7251..2b688b3 100644 --- a/config/eu.am +++ b/config/eu.am @@ -135,7 +135,6 @@ AM_CFLAGS = -Wall -Wshadow -Wformat=2 \ diff --git a/meta/recipes-devtools/elfutils/files/0001-libelf-Add-libeu-objects-to-libelf.a-static-archive.patch b/meta/recipes-devtools/elfutils/files/0001-libelf-Add-libeu-objects-to-libelf.a-static-archive.patch deleted file mode 100644 index c2571c27f9..0000000000 --- a/meta/recipes-devtools/elfutils/files/0001-libelf-Add-libeu-objects-to-libelf.a-static-archive.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ad94a59ebcc32f71853716aff650997076d112df Mon Sep 17 00:00:00 2001 -From: Mark Wielaard -Date: Tue, 22 Oct 2024 15:03:42 +0200 -Subject: [PATCH] libelf: Add libeu objects to libelf.a static archive - -libelf might use some symbols from libeu.a, specifically the eu-search -wrappers. But we don't ship libeu.a separately. So include the libeu -objects in the libelf.a archive to facilitate static linking. - - * libelf/Makefile.am (libeu_objects): New variable. - (libelf_a_LIBADD): New, add libeu_objects. - -https://sourceware.org/bugzilla/show_bug.cgi?id=32293 - -Signed-off-by: Mark Wielaard -Signed-off-by: Martin Jansa -Upstream-Status: Backport [https://sourceware.org/git/?p=elfutils.git;a=commit;h=f5d6e088f84dd05278c4698a21cbf1ff4569978d] ---- - libelf/Makefile.am | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/libelf/Makefile.am b/libelf/Makefile.am -index cc539c8..156a486 100644 ---- a/libelf/Makefile.am -+++ b/libelf/Makefile.am -@@ -126,6 +126,9 @@ libelf.so: $(srcdir)/libelf.map $(libelf_so_LIBS) $(libelf_so_DEPS) - libeu_objects = $(shell cat ../lib/libeu.manifest) - libelf_a_LIBADD = $(addprefix ../lib/,$(libeu_objects)) - -+libeu_objects = $(shell $(AR) t ../lib/libeu.a) -+libelf_a_LIBADD = $(addprefix ../lib/,$(libeu_objects)) -+ - install: install-am libelf.so - $(mkinstalldirs) $(DESTDIR)$(libdir) - $(INSTALL_PROGRAM) libelf.so $(DESTDIR)$(libdir)/libelf-$(PACKAGE_VERSION).so diff --git a/meta/recipes-devtools/elfutils/files/0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch b/meta/recipes-devtools/elfutils/files/0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch index 297cf19ccb..621be1b37d 100644 --- a/meta/recipes-devtools/elfutils/files/0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch +++ b/meta/recipes-devtools/elfutils/files/0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch @@ -1,4 +1,4 @@ -From 6b339ad9f9084b653b0d0c3823c871a7a9774b63 Mon Sep 17 00:00:00 2001 +From bf22ef3c1a559dc0b265a9c7c2fcda4a20519e63 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Thu, 16 Aug 2018 09:58:26 +0800 Subject: [PATCH] libelf/elf_end.c: check data_list.data.d.d_buf before free it diff --git a/meta/recipes-devtools/elfutils/files/0001-skip-the-test-when-gcc-not-deployed.patch b/meta/recipes-devtools/elfutils/files/0001-skip-the-test-when-gcc-not-deployed.patch index 7a9e1fbcdd..093d03c736 100644 --- a/meta/recipes-devtools/elfutils/files/0001-skip-the-test-when-gcc-not-deployed.patch +++ b/meta/recipes-devtools/elfutils/files/0001-skip-the-test-when-gcc-not-deployed.patch @@ -1,4 +1,4 @@ -From 168f8b6e37a762a6263c279d95fee9346e1f44ca Mon Sep 17 00:00:00 2001 +From db59c8a80a285f9cba3f789b6c2c240481b97db8 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Tue, 21 May 2019 15:20:34 +0800 Subject: [PATCH] skip the test when gcc not deployed diff --git a/meta/recipes-devtools/elfutils/files/0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch b/meta/recipes-devtools/elfutils/files/0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch index 455704b065..eb2d48e3bb 100644 --- a/meta/recipes-devtools/elfutils/files/0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch +++ b/meta/recipes-devtools/elfutils/files/0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch @@ -1,4 +1,4 @@ -From 7355ed2e9d0e1f38ab87f115011ab498388b4a41 Mon Sep 17 00:00:00 2001 +From aba735bf19c60ff85731b3bfe79a6c83e17f3436 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 23 Jun 2020 07:49:35 +0000 Subject: [PATCH] tests/Makefile.am: compile test_nlist with standard CFLAGS @@ -13,10 +13,10 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am -index 946c7d2e..32590f6 100644 +index 055fea7..ba25e61 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -118,7 +118,7 @@ endif +@@ -122,7 +122,7 @@ endif test-nlist$(EXEEXT): test-nlist.c $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) \ diff --git a/meta/recipes-devtools/elfutils/files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch b/meta/recipes-devtools/elfutils/files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch index b02f8e4c08..cc4c5ab75b 100644 --- a/meta/recipes-devtools/elfutils/files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch +++ b/meta/recipes-devtools/elfutils/files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch @@ -1,4 +1,4 @@ -From ad1bf27f823db8a48e1e64ecce2e6998e990dc41 Mon Sep 17 00:00:00 2001 +From 0533b0d67ed99fd2a034e497f0c07ff608ca52e7 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 15 Aug 2017 17:13:59 +0800 Subject: [PATCH] Fix elf_cvt_gunhash if dest and src are same. diff --git a/meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch b/meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch index fd0efe595d..41e4c738f3 100644 --- a/meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch +++ b/meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch @@ -1,4 +1,4 @@ -From 7b48ae456de3e2f2a94f91c800b238788d5fd277 Mon Sep 17 00:00:00 2001 +From 78415c6fc1f464e45222ba588a6cdc0292b4230a Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 15 Aug 2017 17:17:20 +0800 Subject: [PATCH] fixheadercheck diff --git a/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch b/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch index 21073716a0..a5d913b2b7 100644 --- a/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch +++ b/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch @@ -1,4 +1,4 @@ -From efa2836719b669c3200a615898627f6b6a4dd570 Mon Sep 17 00:00:00 2001 +From 0064679018642a9e0e2c9d36eeeedc3a8278356e Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Fri, 23 Aug 2019 10:19:48 +0800 Subject: [PATCH] musl-utils @@ -38,12 +38,12 @@ index d4a4221..f6336d9 100644 /* State of -D/-U flags. */ extern bool arlib_deterministic_output; diff --git a/src/elfcompress.c b/src/elfcompress.c -index f771b92..263de62 100644 +index 7818cce..ed3654b 100644 --- a/src/elfcompress.c +++ b/src/elfcompress.c -@@ -37,6 +37,13 @@ - #include "libeu.h" - #include "printversion.h" +@@ -41,6 +41,13 @@ + /* Really should come from libgen.h, but we poisoned basename in system.h. */ + extern char *dirname(char *path); +#if !defined(ALLPERMS) +# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 */ @@ -56,7 +56,7 @@ index f771b92..263de62 100644 ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; diff --git a/src/strip.c b/src/strip.c -index 20cc8a2..2ce52e8 100644 +index a8ecc80..bf88051 100644 --- a/src/strip.c +++ b/src/strip.c @@ -45,6 +45,13 @@ diff --git a/meta/recipes-devtools/elfutils/files/ptest.patch b/meta/recipes-devtools/elfutils/files/ptest.patch index ebf1d3f4c2..b6a9e5bb73 100644 --- a/meta/recipes-devtools/elfutils/files/ptest.patch +++ b/meta/recipes-devtools/elfutils/files/ptest.patch @@ -1,4 +1,4 @@ -From eeafa586990429f440eb2dbd9b4231edff6ae904 Mon Sep 17 00:00:00 2001 +From abe164f6242825e827b6b13141883591d059d6fe Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 1 May 2019 16:37:48 +0100 Subject: [PATCH] Changes to allow ptest to run standalone on target: @@ -21,7 +21,7 @@ Upstream-Status: Inappropriate [oe specific] 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac -index 80c7fd8..3e31485 100644 +index b0d1b48..acc29f0 100644 --- a/configure.ac +++ b/configure.ac @@ -43,7 +43,7 @@ AC_COPYRIGHT([Copyright (C) 1996-2026 The elfutils developers.]) @@ -34,10 +34,10 @@ index 80c7fd8..3e31485 100644 AM_SILENT_RULES([yes]) diff --git a/tests/Makefile.am b/tests/Makefile.am -index 9a00541..946c7d2e 100644 +index 137e961..055fea7 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -943,3 +943,5 @@ check: check-am coverage +@@ -981,3 +981,5 @@ check: check-am coverage coverage: -$(srcdir)/coverage.sh endif