summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/elfutils/elfutils_0.192.bb (renamed from meta/recipes-devtools/elfutils/elfutils_0.191.bb)12
-rw-r--r--meta/recipes-devtools/elfutils/files/0001-config-eu.am-do-not-force-Werror.patch34
-rw-r--r--meta/recipes-devtools/elfutils/files/0001-debuginfod-Remove-unused-variable.patch34
-rw-r--r--meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch12
-rw-r--r--meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch8
-rw-r--r--meta/recipes-devtools/elfutils/files/0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch6
-rw-r--r--meta/recipes-devtools/elfutils/files/0001-skip-the-test-when-gcc-not-deployed.patch2
-rw-r--r--meta/recipes-devtools/elfutils/files/0001-srcfiles-fix-unused-variable-BUFFER_SIZE.patch36
-rw-r--r--meta/recipes-devtools/elfutils/files/0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch6
-rw-r--r--meta/recipes-devtools/elfutils/files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch2
-rw-r--r--meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch2
-rw-r--r--meta/recipes-devtools/elfutils/files/0003-musl-utils.patch4
-rw-r--r--meta/recipes-devtools/elfutils/files/ptest.patch12
13 files changed, 68 insertions, 102 deletions
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.191.bb b/meta/recipes-devtools/elfutils/elfutils_0.192.bb
index 95364cef97..f455178e16 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.191.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.192.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "elfutils is a collection of utilities and libraries to read, crea
4SECTION = "base" 4SECTION = "base"
5LICENSE = "( GPL-2.0-or-later | LGPL-3.0-or-later ) & GPL-3.0-or-later" 5LICENSE = "( GPL-2.0-or-later | LGPL-3.0-or-later ) & GPL-3.0-or-later"
6LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
7 file://debuginfod/debuginfod-client.c;endline=28;md5=f0a7c3170776866ee94e8f9225a6ad79 \ 7 file://debuginfod/debuginfod-client.c;endline=28;md5=6b7b0a4b25197d7f2e12b2f4aa1c86b8 \
8 " 8 "
9DEPENDS = "zlib virtual/libintl" 9DEPENDS = "zlib virtual/libintl"
10DEPENDS:append:libc-musl = " argp-standalone fts musl-legacy-error musl-obstack" 10DEPENDS:append:libc-musl = " argp-standalone fts musl-legacy-error musl-obstack"
@@ -20,13 +20,12 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
20 file://0001-skip-the-test-when-gcc-not-deployed.patch \ 20 file://0001-skip-the-test-when-gcc-not-deployed.patch \
21 file://ptest.patch \ 21 file://ptest.patch \
22 file://0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch \ 22 file://0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch \
23 file://0001-debuginfod-Remove-unused-variable.patch \ 23 file://0001-config-eu.am-do-not-force-Werror.patch \
24 file://0001-srcfiles-fix-unused-variable-BUFFER_SIZE.patch \
25 " 24 "
26SRC_URI:append:libc-musl = " \ 25SRC_URI:append:libc-musl = " \
27 file://0003-musl-utils.patch \ 26 file://0003-musl-utils.patch \
28 " 27 "
29SRC_URI[sha256sum] = "df76db71366d1d708365fc7a6c60ca48398f14367eb2b8954efc8897147ad871" 28SRC_URI[sha256sum] = "616099beae24aba11f9b63d86ca6cc8d566d968b802391334c91df54eab416b4"
30 29
31inherit autotools gettext ptest pkgconfig 30inherit autotools gettext ptest pkgconfig
32 31
@@ -46,7 +45,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'debuginfod', 'debugi
46PACKAGECONFIG[bzip2] = "--with-bzlib,--without-bzlib,${DEPENDS_BZIP2}" 45PACKAGECONFIG[bzip2] = "--with-bzlib,--without-bzlib,${DEPENDS_BZIP2}"
47PACKAGECONFIG[xz] = "--with-lzma,--without-lzma,xz" 46PACKAGECONFIG[xz] = "--with-lzma,--without-lzma,xz"
48PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd" 47PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd"
49PACKAGECONFIG[libdebuginfod] = "--enable-libdebuginfod,--disable-libdebuginfod,curl" 48PACKAGECONFIG[libdebuginfod] = "--enable-libdebuginfod,--disable-libdebuginfod,curl json-c"
50PACKAGECONFIG[debuginfod] = "--enable-debuginfod,--disable-debuginfod,libarchive sqlite3 libmicrohttpd" 49PACKAGECONFIG[debuginfod] = "--enable-debuginfod,--disable-debuginfod,libarchive sqlite3 libmicrohttpd"
51 50
52RDEPENDS:${PN}-ptest += "libasm libelf bash make coreutils ${PN}-binutils iproute2-ss bsdtar gcc-symlinks binutils-symlinks libgcc-dev" 51RDEPENDS:${PN}-ptest += "libasm libelf bash make coreutils ${PN}-binutils iproute2-ss bsdtar gcc-symlinks binutils-symlinks libgcc-dev"
@@ -69,6 +68,7 @@ do_install_ptest() {
69 # copy the files which needed by the cases 68 # copy the files which needed by the cases
70 TEST_FILES="strip strip.o addr2line elfcmp objdump readelf size.o nm.o nm elflint elfcompress elfclassify stack unstrip srcfiles" 69 TEST_FILES="strip strip.o addr2line elfcmp objdump readelf size.o nm.o nm elflint elfcompress elfclassify stack unstrip srcfiles"
71 install -d -m 755 ${D}${PTEST_PATH}/src 70 install -d -m 755 ${D}${PTEST_PATH}/src
71 install -d -m 755 ${D}${PTEST_PATH}/config
72 install -d -m 755 ${D}${PTEST_PATH}/lib 72 install -d -m 755 ${D}${PTEST_PATH}/lib
73 install -d -m 755 ${D}${PTEST_PATH}/libelf 73 install -d -m 755 ${D}${PTEST_PATH}/libelf
74 install -d -m 755 ${D}${PTEST_PATH}/libdw 74 install -d -m 755 ${D}${PTEST_PATH}/libdw
@@ -96,6 +96,7 @@ do_install_ptest() {
96 cp -r ${S}/tests/ ${D}${PTEST_PATH} 96 cp -r ${S}/tests/ ${D}${PTEST_PATH}
97 cp -r ${B}/tests/* ${D}${PTEST_PATH}/tests 97 cp -r ${B}/tests/* ${D}${PTEST_PATH}/tests
98 cp -r ${B}/config.h ${D}${PTEST_PATH} 98 cp -r ${B}/config.h ${D}${PTEST_PATH}
99 cp -r ${B}/config/profile.sh ${D}${PTEST_PATH}/config
99 cp -r ${B}/backends ${D}${PTEST_PATH} 100 cp -r ${B}/backends ${D}${PTEST_PATH}
100 cp -r ${B}/debuginfod ${D}${PTEST_PATH} 101 cp -r ${B}/debuginfod ${D}${PTEST_PATH}
101 sed -i '/^Makefile:/c Makefile:' ${D}${PTEST_PATH}/tests/Makefile 102 sed -i '/^Makefile:/c Makefile:' ${D}${PTEST_PATH}/tests/Makefile
@@ -121,6 +122,7 @@ LICENSE:libasm = "GPL-2.0-or-later | LGPL-3.0-or-later"
121LICENSE:libdw = "GPL-2.0-or-later | LGPL-3.0-or-later" 122LICENSE:libdw = "GPL-2.0-or-later | LGPL-3.0-or-later"
122LICENSE:libdebuginfod = "GPL-2.0-or-later | LGPL-3.0-or-later" 123LICENSE:libdebuginfod = "GPL-2.0-or-later | LGPL-3.0-or-later"
123 124
125FILES:${PN} += "${datadir}/fish"
124FILES:${PN}-binutils = "\ 126FILES:${PN}-binutils = "\
125 ${bindir}/eu-addr2line \ 127 ${bindir}/eu-addr2line \
126 ${bindir}/eu-ld \ 128 ${bindir}/eu-ld \
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
new file mode 100644
index 0000000000..d4e141927f
--- /dev/null
+++ b/meta/recipes-devtools/elfutils/files/0001-config-eu.am-do-not-force-Werror.patch
@@ -0,0 +1,34 @@
1From e169c3fc734be1783b3e1a4768dbec05fb64cb4f Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Fri, 22 Nov 2024 12:50:48 +0100
4Subject: [PATCH] config/eu.am: do not force -Werror
5
6This is undesirable when compiler versions may not be the same
7as what upstream is using for their own testing.
8
9Upstream-Status: Inappropriate [oe-core specific]
10Signed-off-by: Alexander Kanavin <alex@linutronix.de>
11---
12 config/eu.am | 2 --
13 1 file changed, 2 deletions(-)
14
15diff --git a/config/eu.am b/config/eu.am
16index 0b7dab5..5e7a03f 100644
17--- a/config/eu.am
18+++ b/config/eu.am
19@@ -99,7 +99,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
20 $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \
21 $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \
22 $(USE_AFTER_FREE3_WARNING) \
23- $(if $($(*F)_no_Werror),,-Werror) \
24 $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
25 $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \
26 $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \
27@@ -109,7 +108,6 @@ AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \
28 $(TRAMPOLINES_WARNING) \
29 $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \
30 $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \
31- $(if $($(*F)_no_Werror),,-Werror) \
32 $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
33 $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \
34 $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \
diff --git a/meta/recipes-devtools/elfutils/files/0001-debuginfod-Remove-unused-variable.patch b/meta/recipes-devtools/elfutils/files/0001-debuginfod-Remove-unused-variable.patch
deleted file mode 100644
index 81f49dbf21..0000000000
--- a/meta/recipes-devtools/elfutils/files/0001-debuginfod-Remove-unused-variable.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From c3502140e51886bffc6ae5cd256308e40e0cbb78 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 9 Mar 2024 15:52:32 -0800
4Subject: [PATCH] debuginfod: Remove unused variable
5
6Recent commit acd9525e9 has removed all references to max_fds
7therefore remove it, moreover clang18 is happier
8
9| ../../elfutils-0.191/debuginfod/debuginfod.cxx:1448:8: error: private field 'max_fds' is not used [-Werror,-Wunused-private-field]
10| 1448 | long max_fds;
11| | ^
12| 1 error generated.
13
14Upstream-Status: Submitted [https://sourceware.org/pipermail/elfutils-devel/2024q1/006900.html]
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16---
17 debuginfod/debuginfod.cxx | 1 -
18 1 file changed, 1 deletion(-)
19
20diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx
21index 560880f2..72617848 100644
22--- a/debuginfod/debuginfod.cxx
23+++ b/debuginfod/debuginfod.cxx
24@@ -1445,7 +1445,6 @@ private:
25
26 map<key,fdcache_entry> entries; // optimized for lookup
27 time_t last_cleaning;
28- long max_fds;
29 long max_mbs;
30
31 public:
32--
332.44.0
34
diff --git a/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch b/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch
index 4f7539bef2..0eb532f3dd 100644
--- a/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch
+++ b/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch
@@ -1,4 +1,4 @@
1From 63070df4b0dc7af37a720915b5e6494204463c9a Mon Sep 17 00:00:00 2001 1From 7b0f78c86bf2e658649327fb3dd1b862f282c42e Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 15 Aug 2017 17:10:57 +0800 3Date: Tue, 15 Aug 2017 17:10:57 +0800
4Subject: [PATCH] dso link change 4Subject: [PATCH] dso link change
@@ -22,10 +22,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
22 2 files changed, 2 insertions(+), 2 deletions(-) 22 2 files changed, 2 insertions(+), 2 deletions(-)
23 23
24diff --git a/src/Makefile.am b/src/Makefile.am 24diff --git a/src/Makefile.am b/src/Makefile.am
25index 1d592d4..853eda4 100644 25index 6bdf2df..3bcee3c 100644
26--- a/src/Makefile.am 26--- a/src/Makefile.am
27+++ b/src/Makefile.am 27+++ b/src/Makefile.am
28@@ -50,7 +50,7 @@ libdebuginfod = 28@@ -56,7 +56,7 @@ libdebuginfod =
29 endif 29 endif
30 else 30 else
31 libasm = ../libasm/libasm.so 31 libasm = ../libasm/libasm.so
@@ -35,11 +35,11 @@ index 1d592d4..853eda4 100644
35 if LIBDEBUGINFOD 35 if LIBDEBUGINFOD
36 libdebuginfod = ../debuginfod/libdebuginfod.so 36 libdebuginfod = ../debuginfod/libdebuginfod.so
37diff --git a/tests/Makefile.am b/tests/Makefile.am 37diff --git a/tests/Makefile.am b/tests/Makefile.am
38index 9141074..ee49d07 100644 38index 76f1682..865a604 100644
39--- a/tests/Makefile.am 39--- a/tests/Makefile.am
40+++ b/tests/Makefile.am 40+++ b/tests/Makefile.am
41@@ -694,7 +694,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl -lpthread 41@@ -733,7 +733,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl -lpthread
42 libelf = ../libelf/libelf.a -lz $(zstd_LIBS) 42 libelf = ../libelf/libelf.a -lz $(zstd_LIBS) $(libeu)
43 libasm = ../libasm/libasm.a 43 libasm = ../libasm/libasm.a
44 else 44 else
45-libdw = ../libdw/libdw.so 45-libdw = ../libdw/libdw.so
diff --git a/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch b/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch
index a9f5e030fc..6031b721fc 100644
--- a/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch
+++ b/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch
@@ -1,4 +1,4 @@
1From 46d9d889a07fc9f9f089f800e5c0e895889c44ae Mon Sep 17 00:00:00 2001 1From 7bcee92c2006b7adad463be28cf4c3af21489cd2 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 4 Oct 2017 22:30:46 -0700 3Date: Wed, 4 Oct 2017 22:30:46 -0700
4Subject: [PATCH] libasm may link with libbz2 if found 4Subject: [PATCH] libasm may link with libbz2 if found
@@ -16,10 +16,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
16 1 file changed, 2 insertions(+), 2 deletions(-) 16 1 file changed, 2 insertions(+), 2 deletions(-)
17 17
18diff --git a/src/Makefile.am b/src/Makefile.am 18diff --git a/src/Makefile.am b/src/Makefile.am
19index 853eda4..da7f3b4 100644 19index 3bcee3c..18eed9a 100644
20--- a/src/Makefile.am 20--- a/src/Makefile.am
21+++ b/src/Makefile.am 21+++ b/src/Makefile.am
22@@ -40,7 +40,7 @@ EXTRA_DIST += make-debug-archive.in 22@@ -46,7 +46,7 @@ EXTRA_DIST += make-debug-archive.in
23 CLEANFILES += make-debug-archive 23 CLEANFILES += make-debug-archive
24 24
25 if BUILD_STATIC 25 if BUILD_STATIC
@@ -28,7 +28,7 @@ index 853eda4..da7f3b4 100644
28 libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) -ldl -lpthread 28 libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) -ldl -lpthread
29 libelf = ../libelf/libelf.a -lz $(zstd_LIBS) 29 libelf = ../libelf/libelf.a -lz $(zstd_LIBS)
30 if LIBDEBUGINFOD 30 if LIBDEBUGINFOD
31@@ -49,7 +49,7 @@ else 31@@ -55,7 +55,7 @@ else
32 libdebuginfod = 32 libdebuginfod =
33 endif 33 endif
34 else 34 else
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 57e4b3890a..1ee50588dc 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 @@
1From 19d9e9d838e74e4a0a22f08ae03167380f8aa490 Mon Sep 17 00:00:00 2001 1From c4a26ff38182b289a1076bbef263e808b5e3aa97 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com> 2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Thu, 16 Aug 2018 09:58:26 +0800 3Date: Thu, 16 Aug 2018 09:58:26 +0800
4Subject: [PATCH] libelf/elf_end.c: check data_list.data.d.d_buf before free it 4Subject: [PATCH] libelf/elf_end.c: check data_list.data.d.d_buf before free it
@@ -19,10 +19,10 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
19 1 file changed, 4 insertions(+), 2 deletions(-) 19 1 file changed, 4 insertions(+), 2 deletions(-)
20 20
21diff --git a/libelf/elf_end.c b/libelf/elf_end.c 21diff --git a/libelf/elf_end.c b/libelf/elf_end.c
22index 80f4d13..b103959 100644 22index da8f3a2..8557658 100644
23--- a/libelf/elf_end.c 23--- a/libelf/elf_end.c
24+++ b/libelf/elf_end.c 24+++ b/libelf/elf_end.c
25@@ -169,14 +169,16 @@ elf_end (Elf *elf) 25@@ -170,14 +170,16 @@ elf_end (Elf *elf)
26 architecture doesn't require overly stringent 26 architecture doesn't require overly stringent
27 alignment the raw data buffer is the same as the 27 alignment the raw data buffer is the same as the
28 one used for presenting to the caller. */ 28 one used for presenting to the caller. */
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 096361e215..2fc526372d 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 @@
1From f9ab54454000fd210dbaa92cf516084d05060f9d Mon Sep 17 00:00:00 2001 1From d59d6fd13e4a7fe3fdca2a4ce1cd2def36356bb4 Mon Sep 17 00:00:00 2001
2From: Mingli Yu <Mingli.Yu@windriver.com> 2From: Mingli Yu <Mingli.Yu@windriver.com>
3Date: Tue, 21 May 2019 15:20:34 +0800 3Date: Tue, 21 May 2019 15:20:34 +0800
4Subject: [PATCH] skip the test when gcc not deployed 4Subject: [PATCH] skip the test when gcc not deployed
diff --git a/meta/recipes-devtools/elfutils/files/0001-srcfiles-fix-unused-variable-BUFFER_SIZE.patch b/meta/recipes-devtools/elfutils/files/0001-srcfiles-fix-unused-variable-BUFFER_SIZE.patch
deleted file mode 100644
index b3032327a2..0000000000
--- a/meta/recipes-devtools/elfutils/files/0001-srcfiles-fix-unused-variable-BUFFER_SIZE.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From db51a55a8e3811d19265bf12d2ff715c6cf558b4 Mon Sep 17 00:00:00 2001
2From: Jose Quaresma <jose.quaresma@foundries.io>
3Date: Tue, 19 Mar 2024 10:17:59 +0000
4Subject: [PATCH] srcfiles: fix unused variable BUFFER_SIZE
5
6The const variable BUFFER_SIZE is used only on the zip_files
7function witch is only available with LIBARCHIVE.
8
9| ../../elfutils-0.191/src/srcfiles.cxx:81:18: error: unused variable 'BUFFER_SIZE' [-Werror,-Wunused-const-variable]
10| 81 | constexpr size_t BUFFER_SIZE = 8192;
11| | ^~~~~~~~~~~
12
13Upstream-Status: Backport [https://sourceware.org/git/?p=elfutils.git;a=commitdiff;h=ef8a4b841aaf26326b8961a651dbe915d54d23e7]
14
15Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
16---
17 src/srcfiles.cxx | 2 ++
18 1 file changed, 2 insertions(+)
19
20diff --git a/src/srcfiles.cxx b/src/srcfiles.cxx
21index 892737cc..09d50f8d 100644
22--- a/src/srcfiles.cxx
23+++ b/src/srcfiles.cxx
24@@ -78,7 +78,9 @@ ARGP_PROGRAM_VERSION_HOOK_DEF = print_version;
25 /* Bug report address. */
26 ARGP_PROGRAM_BUG_ADDRESS_DEF = PACKAGE_BUGREPORT;
27
28+#ifdef HAVE_LIBARCHIVE
29 constexpr size_t BUFFER_SIZE = 8192;
30+#endif
31
32 /* Definitions of arguments for argp functions. */
33 static const struct argp_option options[] =
34--
352.44.0
36
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 d410eb13d8..f3790a6d25 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 @@
1From 2d4dfb814dda02193e49c9203147cf73e6d3f8b7 Mon Sep 17 00:00:00 2001 1From 34ae914b362c84ff0a96b8936beedb44a2e3f451 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 23 Jun 2020 07:49:35 +0000 3Date: Tue, 23 Jun 2020 07:49:35 +0000
4Subject: [PATCH] tests/Makefile.am: compile test_nlist with standard CFLAGS 4Subject: [PATCH] tests/Makefile.am: compile test_nlist with standard CFLAGS
@@ -13,10 +13,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13 1 file changed, 1 insertion(+), 1 deletion(-) 13 1 file changed, 1 insertion(+), 1 deletion(-)
14 14
15diff --git a/tests/Makefile.am b/tests/Makefile.am 15diff --git a/tests/Makefile.am b/tests/Makefile.am
16index 3bd8e58..370c6a8 100644 16index eed9bd4..5dd6e05 100644
17--- a/tests/Makefile.am 17--- a/tests/Makefile.am
18+++ b/tests/Makefile.am 18+++ b/tests/Makefile.am
19@@ -103,7 +103,7 @@ endif 19@@ -104,7 +104,7 @@ endif
20 test-nlist$(EXEEXT): test-nlist.c 20 test-nlist$(EXEEXT): test-nlist.c
21 $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ 21 $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
22 $(AM_CPPFLAGS) $(CPPFLAGS) \ 22 $(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 fa2282b8dd..bf177cce4a 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 @@
1From d8f07a23d608b744dcc0592f9f32f258b186a77c Mon Sep 17 00:00:00 2001 1From bd78783254a7126d82eab26a2069b3a457b98e2e Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 15 Aug 2017 17:13:59 +0800 3Date: Tue, 15 Aug 2017 17:13:59 +0800
4Subject: [PATCH] Fix elf_cvt_gunhash if dest and src are same. 4Subject: [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 e8b986e4ba..a539396fd8 100644
--- a/meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch
+++ b/meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch
@@ -1,4 +1,4 @@
1From 614f062b22e6da108643f8644a3e92a1108f2b9b Mon Sep 17 00:00:00 2001 1From da61b483072b7b0bfac1f034ad03972f5104a410 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 15 Aug 2017 17:17:20 +0800 3Date: Tue, 15 Aug 2017 17:17:20 +0800
4Subject: [PATCH] fixheadercheck 4Subject: [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 230ea88f41..d8961f6293 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 @@
1From aab5985a29bd7ab6e0b06eaab190b42a04e10f70 Mon Sep 17 00:00:00 2001 1From b1c956cd739f364c4a80381578ddaba43e36903b Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Fri, 23 Aug 2019 10:19:48 +0800 3Date: Fri, 23 Aug 2019 10:19:48 +0800
4Subject: [PATCH] musl-utils 4Subject: [PATCH] musl-utils
@@ -56,7 +56,7 @@ index f771b92..263de62 100644
56 ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; 56 ARGP_PROGRAM_VERSION_HOOK_DEF = print_version;
57 57
58diff --git a/src/strip.c b/src/strip.c 58diff --git a/src/strip.c b/src/strip.c
59index 6436443..1608496 100644 59index 403e0f6..738e948 100644
60--- a/src/strip.c 60--- a/src/strip.c
61+++ b/src/strip.c 61+++ b/src/strip.c
62@@ -45,6 +45,13 @@ 62@@ -45,6 +45,13 @@
diff --git a/meta/recipes-devtools/elfutils/files/ptest.patch b/meta/recipes-devtools/elfutils/files/ptest.patch
index 2152875d63..1de82ef32b 100644
--- a/meta/recipes-devtools/elfutils/files/ptest.patch
+++ b/meta/recipes-devtools/elfutils/files/ptest.patch
@@ -1,4 +1,4 @@
1From d49f6a135762ec1f1831d0e80b8df2a4269b0a66 Mon Sep 17 00:00:00 2001 1From 74dad3295f2b8dc06b7e6bb876bc4541e927ef47 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org> 2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Wed, 1 May 2019 16:37:48 +0100 3Date: Wed, 1 May 2019 16:37:48 +0100
4Subject: [PATCH] Changes to allow ptest to run standalone on target: 4Subject: [PATCH] Changes to allow ptest to run standalone on target:
@@ -21,7 +21,7 @@ Upstream-Status: Inappropriate [oe specific]
21 3 files changed, 3 insertions(+), 7 deletions(-) 21 3 files changed, 3 insertions(+), 7 deletions(-)
22 22
23diff --git a/configure.ac b/configure.ac 23diff --git a/configure.ac b/configure.ac
24index bbe8673..488712b 100644 24index f191488..426a68f 100644
25--- a/configure.ac 25--- a/configure.ac
26+++ b/configure.ac 26+++ b/configure.ac
27@@ -49,7 +49,7 @@ AC_COPYRIGHT([Copyright (C) 1996-2024 The elfutils developers.]) 27@@ -49,7 +49,7 @@ AC_COPYRIGHT([Copyright (C) 1996-2024 The elfutils developers.])
@@ -34,20 +34,20 @@ index bbe8673..488712b 100644
34 34
35 AM_SILENT_RULES([yes]) 35 AM_SILENT_RULES([yes])
36diff --git a/tests/Makefile.am b/tests/Makefile.am 36diff --git a/tests/Makefile.am b/tests/Makefile.am
37index ee49d07..3bd8e58 100644 37index 865a604..eed9bd4 100644
38--- a/tests/Makefile.am 38--- a/tests/Makefile.am
39+++ b/tests/Makefile.am 39+++ b/tests/Makefile.am
40@@ -852,3 +852,5 @@ check: check-am coverage 40@@ -893,3 +893,5 @@ check: check-am coverage
41 coverage: 41 coverage:
42 -$(srcdir)/coverage.sh 42 -$(srcdir)/coverage.sh
43 endif 43 endif
44+oecheck: 44+oecheck:
45+ $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) 45+ $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
46diff --git a/tests/test-subr.sh b/tests/test-subr.sh 46diff --git a/tests/test-subr.sh b/tests/test-subr.sh
47index 411e5f2..a638ff9 100644 47index ea80cbe..7632d20 100644
48--- a/tests/test-subr.sh 48--- a/tests/test-subr.sh
49+++ b/tests/test-subr.sh 49+++ b/tests/test-subr.sh
50@@ -91,12 +91,6 @@ installed_testrun() 50@@ -92,12 +92,6 @@ installed_testrun()
51 program="$1" 51 program="$1"
52 shift 52 shift
53 case "$program" in 53 case "$program" in