| Patrick Williams | b58112e | 2024-03-07 11:16:36 -0600 | [diff] [blame] | 1 | From 46d9d889a07fc9f9f089f800e5c0e895889c44ae Mon Sep 17 00:00:00 2001 | 
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 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 |  | 
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 12 | Upstream-Status: Pending | 
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 
|  | 14 | --- | 
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 15 | src/Makefile.am | 4 ++-- | 
|  | 16 | 1 file changed, 2 insertions(+), 2 deletions(-) | 
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 17 |  | 
|  | 18 | diff --git a/src/Makefile.am b/src/Makefile.am | 
| Patrick Williams | b58112e | 2024-03-07 11:16:36 -0600 | [diff] [blame] | 19 | index 853eda4..da7f3b4 100644 | 
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 20 | --- a/src/Makefile.am | 
|  | 21 | +++ b/src/Makefile.am | 
| Patrick Williams | b58112e | 2024-03-07 11:16:36 -0600 | [diff] [blame] | 22 | @@ -40,7 +40,7 @@ EXTRA_DIST += make-debug-archive.in | 
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 23 | CLEANFILES += make-debug-archive | 
|  | 24 |  | 
|  | 25 | if BUILD_STATIC | 
|  | 26 | -libasm = ../libasm/libasm.a | 
|  | 27 | +libasm = ../libasm/libasm.a $(zip_LIBS) | 
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 28 | libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) -ldl -lpthread | 
| Patrick Williams | b58112e | 2024-03-07 11:16:36 -0600 | [diff] [blame] | 29 | libelf = ../libelf/libelf.a -lz $(zstd_LIBS) | 
|  | 30 | if LIBDEBUGINFOD | 
|  | 31 | @@ -49,7 +49,7 @@ else | 
|  | 32 | libdebuginfod = | 
|  | 33 | endif | 
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 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 | 
| Patrick Williams | b58112e | 2024-03-07 11:16:36 -0600 | [diff] [blame] | 39 | if LIBDEBUGINFOD |