mirror of
https://git.yoctoproject.org/poky
synced 2026-02-20 08:29:42 +01:00
ecabf7386f
Drop 0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch Drop 0001-musl-obstack-fts.patch (upstream has fixed the issues). Drop a few other chunks where upstream has fixed the issues or removed the code being patched. Adjust ptests to pass again. (From OE-Core rev: d358212bb557c99b266a0022ce973782c8c4d260) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
From ed1975deeaa47f98d212fd144c8bda075b1a5d36 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 c28d81f..951e978 100644
|
|
--- a/src/Makefile.am
|
|
+++ b/src/Makefile.am
|
|
@@ -40,11 +40,11 @@ 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
|
|
else
|
|
-libasm = ../libasm/libasm.so
|
|
+libasm = ../libasm/libasm.so $(zip_LIBS)
|
|
libdw = ../libdw/libdw.so $(zip_LIBS) $(libelf) $(libebl) -ldl
|
|
libelf = ../libelf/libelf.so
|
|
endif
|