diff options
| -rw-r--r-- | meta/recipes-devtools/elfutils/elfutils_0.192.bb | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch | 39 |
2 files changed, 0 insertions, 40 deletions
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.192.bb b/meta/recipes-devtools/elfutils/elfutils_0.192.bb index 7bf9865555..4fbfa4b135 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 \ | |||
| 15 | file://0001-dso-link-change.patch \ | 15 | file://0001-dso-link-change.patch \ |
| 16 | file://0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch \ | 16 | file://0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch \ |
| 17 | file://0003-fixheadercheck.patch \ | 17 | file://0003-fixheadercheck.patch \ |
| 18 | file://0001-libasm-may-link-with-libbz2-if-found.patch \ | ||
| 19 | file://0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch \ | 18 | file://0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch \ |
| 20 | file://0001-skip-the-test-when-gcc-not-deployed.patch \ | 19 | file://0001-skip-the-test-when-gcc-not-deployed.patch \ |
| 21 | file://ptest.patch \ | 20 | 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 6031b721fc..0000000000 --- a/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch +++ /dev/null | |||
| @@ -1,39 +0,0 @@ | |||
| 1 | From 7bcee92c2006b7adad463be28cf4c3af21489cd2 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Wed, 4 Oct 2017 22:30:46 -0700 | ||
| 4 | Subject: [PATCH] libasm may link with libbz2 if found | ||
| 5 | |||
| 6 | This can fail to link binaries like objdump | ||
| 7 | where indirect libraries may be not found by linker | ||
| 8 | |||
| 9 | | /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 | ||
| 10 | | collect2: error: ld returned 1 exit status | ||
| 11 | |||
| 12 | Upstream-Status: Pending | ||
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 14 | --- | ||
| 15 | src/Makefile.am | 4 ++-- | ||
| 16 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 17 | |||
| 18 | diff --git a/src/Makefile.am b/src/Makefile.am | ||
| 19 | index 3bcee3c..18eed9a 100644 | ||
| 20 | --- a/src/Makefile.am | ||
| 21 | +++ b/src/Makefile.am | ||
| 22 | @@ -46,7 +46,7 @@ EXTRA_DIST += make-debug-archive.in | ||
| 23 | CLEANFILES += make-debug-archive | ||
| 24 | |||
| 25 | if BUILD_STATIC | ||
| 26 | -libasm = ../libasm/libasm.a | ||
| 27 | +libasm = ../libasm/libasm.a $(zip_LIBS) | ||
| 28 | libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) -ldl -lpthread | ||
| 29 | libelf = ../libelf/libelf.a -lz $(zstd_LIBS) | ||
| 30 | if LIBDEBUGINFOD | ||
| 31 | @@ -55,7 +55,7 @@ else | ||
| 32 | libdebuginfod = | ||
| 33 | endif | ||
| 34 | else | ||
| 35 | -libasm = ../libasm/libasm.so | ||
| 36 | +libasm = ../libasm/libasm.so $(zip_LIBS) | ||
| 37 | libdw = ../libdw/libdw.so $(zip_LIBS) $(libelf) $(libebl) -ldl | ||
| 38 | libelf = ../libelf/libelf.so | ||
| 39 | if LIBDEBUGINFOD | ||
