From 16868477597125296c8618177cd4f61baacd878b Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 7 Apr 2025 11:40:31 +0200 Subject: [PATCH] elfutils: remove 0001-libasm-may-link-with-libbz2-if-found.patch The original linking issues seem to be long gone. Signed-off-by: Alexander Kanavin Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- .../elfutils/elfutils_0.192.bb | 1 - ...libasm-may-link-with-libbz2-if-found.patch | 39 ------------------- 2 files changed, 40 deletions(-) delete mode 100644 meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch diff --git a/meta/recipes-devtools/elfutils/elfutils_0.192.bb b/meta/recipes-devtools/elfutils/elfutils_0.192.bb index 7bf9865555d..4fbfa4b1357 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.192.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.192.bb @@ -15,7 +15,6 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ file://0001-dso-link-change.patch \ file://0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch \ file://0003-fixheadercheck.patch \ - file://0001-libasm-may-link-with-libbz2-if-found.patch \ file://0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch \ file://0001-skip-the-test-when-gcc-not-deployed.patch \ file://ptest.patch \ 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 deleted file mode 100644 index 6031b721fcb..00000000000 --- a/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 7bcee92c2006b7adad463be28cf4c3af21489cd2 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 4 Oct 2017 22:30:46 -0700 -Subject: [PATCH] libasm may link with libbz2 if found - -This can fail to link binaries like objdump -where indirect libraries may be not found by linker - -| /mnt/a/oe/build/tmp/work/riscv64-bec-linux/elfutils/0.170-r0/recipe-sysroot/usr/lib/libbz2.so.1: error adding symbols: DSO missing from command line -| collect2: error: ld returned 1 exit status - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - src/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 3bcee3c..18eed9a 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -46,7 +46,7 @@ EXTRA_DIST += make-debug-archive.in - CLEANFILES += make-debug-archive - - if BUILD_STATIC --libasm = ../libasm/libasm.a -+libasm = ../libasm/libasm.a $(zip_LIBS) - libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) -ldl -lpthread - libelf = ../libelf/libelf.a -lz $(zstd_LIBS) - if LIBDEBUGINFOD -@@ -55,7 +55,7 @@ else - libdebuginfod = - endif - else --libasm = ../libasm/libasm.so -+libasm = ../libasm/libasm.so $(zip_LIBS) - libdw = ../libdw/libdw.so $(zip_LIBS) $(libelf) $(libebl) -ldl - libelf = ../libelf/libelf.so - if LIBDEBUGINFOD -- 2.47.3