mirror of
https://git.yoctoproject.org/poky
synced 2026-02-20 08:29:42 +01:00
4d80c539be
Drop backports: 0001-Add-helper-function-for-basename.patch 0001-tests-fix-build-against-upcoming-gcc-14-Werror-callo.patch (From OE-Core rev: 797117902490fcd336697397ea5d8c2a601124b2) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
From 46d9d889a07fc9f9f089f800e5c0e895889c44ae Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Wed, 4 Oct 2017 22:30:46 -0700
|
|
Subject: [PATCH] libasm may link with libbz2 if found
|
|
|
|
This can fail to link binaries like objdump
|
|
where indirect libraries may be not found by linker
|
|
|
|
| /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
|
|
| collect2: error: ld returned 1 exit status
|
|
|
|
Upstream-Status: Pending
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
---
|
|
src/Makefile.am | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/Makefile.am b/src/Makefile.am
|
|
index 853eda4..da7f3b4 100644
|
|
--- a/src/Makefile.am
|
|
+++ b/src/Makefile.am
|
|
@@ -40,7 +40,7 @@ EXTRA_DIST += make-debug-archive.in
|
|
CLEANFILES += make-debug-archive
|
|
|
|
if BUILD_STATIC
|
|
-libasm = ../libasm/libasm.a
|
|
+libasm = ../libasm/libasm.a $(zip_LIBS)
|
|
libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) -ldl -lpthread
|
|
libelf = ../libelf/libelf.a -lz $(zstd_LIBS)
|
|
if LIBDEBUGINFOD
|
|
@@ -49,7 +49,7 @@ else
|
|
libdebuginfod =
|
|
endif
|
|
else
|
|
-libasm = ../libasm/libasm.so
|
|
+libasm = ../libasm/libasm.so $(zip_LIBS)
|
|
libdw = ../libdw/libdw.so $(zip_LIBS) $(libelf) $(libebl) -ldl
|
|
libelf = ../libelf/libelf.so
|
|
if LIBDEBUGINFOD
|