blob: a9f5e030fc00619399a5951e53019b2756e30ea0 [file] [log] [blame]
Patrick Williamsb58112e2024-03-07 11:16:36 -06001From 46d9d889a07fc9f9f089f800e5c0e895889c44ae Mon Sep 17 00:00:00 2001
Brad Bishopd7bf8c12018-02-25 22:55:05 -05002From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 4 Oct 2017 22:30:46 -0700
4Subject: [PATCH] libasm may link with libbz2 if found
5
6This can fail to link binaries like objdump
7where 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 Bishop1a4b7ee2018-12-16 17:11:34 -080012Upstream-Status: Pending
Brad Bishopd7bf8c12018-02-25 22:55:05 -050013Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080015 src/Makefile.am | 4 ++--
16 1 file changed, 2 insertions(+), 2 deletions(-)
Brad Bishopd7bf8c12018-02-25 22:55:05 -050017
18diff --git a/src/Makefile.am b/src/Makefile.am
Patrick Williamsb58112e2024-03-07 11:16:36 -060019index 853eda4..da7f3b4 100644
Brad Bishopd7bf8c12018-02-25 22:55:05 -050020--- a/src/Makefile.am
21+++ b/src/Makefile.am
Patrick Williamsb58112e2024-03-07 11:16:36 -060022@@ -40,7 +40,7 @@ EXTRA_DIST += make-debug-archive.in
Brad Bishopd7bf8c12018-02-25 22:55:05 -050023 CLEANFILES += make-debug-archive
24
25 if BUILD_STATIC
26-libasm = ../libasm/libasm.a
27+libasm = ../libasm/libasm.a $(zip_LIBS)
Andrew Geissler82c905d2020-04-13 13:39:40 -050028 libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) -ldl -lpthread
Patrick Williamsb58112e2024-03-07 11:16:36 -060029 libelf = ../libelf/libelf.a -lz $(zstd_LIBS)
30 if LIBDEBUGINFOD
31@@ -49,7 +49,7 @@ else
32 libdebuginfod =
33 endif
Brad Bishopd7bf8c12018-02-25 22:55:05 -050034 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 Williamsb58112e2024-03-07 11:16:36 -060039 if LIBDEBUGINFOD