| Andrew Geissler | 90fd73c | 2021-03-05 15:25:55 -0600 | [diff] [blame^] | 1 | From ed1975deeaa47f98d212fd144c8bda075b1a5d36 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> |
| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 14 | |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 15 | --- |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 16 | src/Makefile.am | 4 ++-- |
| 17 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 18 | |
| 19 | diff --git a/src/Makefile.am b/src/Makefile.am |
| Andrew Geissler | 90fd73c | 2021-03-05 15:25:55 -0600 | [diff] [blame^] | 20 | index c28d81f..951e978 100644 |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 21 | --- a/src/Makefile.am |
| 22 | +++ b/src/Makefile.am |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 23 | @@ -40,11 +40,11 @@ EXTRA_DIST += make-debug-archive.in |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 24 | CLEANFILES += make-debug-archive |
| 25 | |
| 26 | if BUILD_STATIC |
| 27 | -libasm = ../libasm/libasm.a |
| 28 | +libasm = ../libasm/libasm.a $(zip_LIBS) |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 29 | libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) -ldl -lpthread |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 30 | 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 |