summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-10-05 17:50:48 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-05 22:33:21 +0000
commita71ed807cb507eefc987577303ee53ce6db9ccf2 (patch)
tree3af34b10f6af43cdfda90d40310ea191d3d88550 /meta
parentb4ddaefd6204220d45d8f14d7a27c9a8e9478d69 (diff)
downloadpoky-a71ed807cb507eefc987577303ee53ce6db9ccf2.tar.gz
elfutils: Fix missing library on linker cmdline
(From OE-Core rev: 0caa41cf9692ac2cdf62b31cda8edd8241198697) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/elfutils/elfutils_0.170.bb1
-rw-r--r--meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch39
2 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.170.bb b/meta/recipes-devtools/elfutils/elfutils_0.170.bb
index 8a339e48c9..3b81e287b0 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.170.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.170.bb
@@ -17,6 +17,7 @@ SRC_URI += "\
17 file://0005-fix-a-stack-usage-warning.patch \ 17 file://0005-fix-a-stack-usage-warning.patch \
18 file://0006-Fix-build-on-aarch64-musl.patch \ 18 file://0006-Fix-build-on-aarch64-musl.patch \
19 file://0007-Fix-control-path-where-we-have-str-as-uninitialized-.patch \ 19 file://0007-Fix-control-path-where-we-have-str-as-uninitialized-.patch \
20 file://0001-libasm-may-link-with-libbz2-if-found.patch \
20" 21"
21SRC_URI_append_libc-musl = " file://0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch" 22SRC_URI_append_libc-musl = " file://0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch"
22 23
diff --git a/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch b/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch
new file mode 100644
index 0000000000..fb0b060b4b
--- /dev/null
+++ b/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch
@@ -0,0 +1,39 @@
1From 7672e363468271b4c63ff58770c5aac15ab8f722 Mon Sep 17 00:00:00 2001
2From: 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
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14Upstream-Status: Pending
15
16 src/Makefile.am | 6 +++---
17 1 file changed, 3 insertions(+), 3 deletions(-)
18
19diff --git a/src/Makefile.am b/src/Makefile.am
20index e03bc32..9b7e853 100644
21--- a/src/Makefile.am
22+++ b/src/Makefile.am
23@@ -39,11 +39,11 @@ EXTRA_DIST += make-debug-archive.in
24 CLEANFILES += make-debug-archive
25
26 if BUILD_STATIC
27-libasm = ../libasm/libasm.a
28+libasm = ../libasm/libasm.a $(zip_LIBS)
29 libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl
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
37--
382.14.2
39