mirror of
https://git.yoctoproject.org/poky
synced 2026-02-20 08:29:42 +01:00
740b931d39
In the upgrade a large number of Upstream-Status tags were dropped, so add them back. I'm taking the stand that copying a patch Debian is carrying doesn't count as a backport. Remove two Debian-specific patches (one for Hurd, one for kfreebsd) so we're not carrying useless patches. Remove two patches that are no longer applied. (From OE-Core rev: b039b26958655aab496b588f4e41a5dea1bfaac1) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
From 74629016e76343a4bf39915c9192b6bf26a57c2d 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 9305b84..9b7e853 100644
|
|
--- a/src/Makefile.am
|
|
+++ b/src/Makefile.am
|
|
@@ -39,11 +39,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) $(libebl) -ldl
|
|
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
|
|
--
|
|
2.7.4
|
|
|