blob: 73ead6d412f389294a8e1e88a0d77d1c6d4a020e [file] [log] [blame]
Andrew Geissler82c905d2020-04-13 13:39:40 -05001From 8e5fff8b1d819e0870fb22b27950bb5f10c7a272 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>
Brad Bishop19323692019-04-05 15:28:33 -040014
Brad Bishopd7bf8c12018-02-25 22:55:05 -050015---
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080016 src/Makefile.am | 4 ++--
17 1 file changed, 2 insertions(+), 2 deletions(-)
Brad Bishopd7bf8c12018-02-25 22:55:05 -050018
19diff --git a/src/Makefile.am b/src/Makefile.am
Andrew Geissler82c905d2020-04-13 13:39:40 -050020index ea1215b..13d9bda 100644
Brad Bishopd7bf8c12018-02-25 22:55:05 -050021--- a/src/Makefile.am
22+++ b/src/Makefile.am
Andrew Geissler82c905d2020-04-13 13:39:40 -050023@@ -40,11 +40,11 @@ EXTRA_DIST += make-debug-archive.in
Brad Bishopd7bf8c12018-02-25 22:55:05 -050024 CLEANFILES += make-debug-archive
25
26 if BUILD_STATIC
27-libasm = ../libasm/libasm.a
28+libasm = ../libasm/libasm.a $(zip_LIBS)
Andrew Geissler82c905d2020-04-13 13:39:40 -050029 libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) -ldl -lpthread
Brad Bishopd7bf8c12018-02-25 22:55:05 -050030 libelf = ../libelf/libelf.a -lz
31 else
32-libasm = ../libasm/libasm.so
33+libasm = ../libasm/libasm.so $(zip_LIBS)
34 libdw = ../libdw/libdw.so $(zip_LIBS) $(libelf) $(libebl) -ldl
35 libelf = ../libelf/libelf.so
36 endif