summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com>2018-02-16 19:19:12 +0530
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-24 10:31:46 +0000
commite3644b3a716e1bbcd3fbf877109d8b965cda7db7 (patch)
tree47f825f6b009fe98c6dc971dab4b215b70f0f44a
parent237a7d08affa58e780edb04046f0023e2fecc20d (diff)
downloadpoky-e3644b3a716e1bbcd3fbf877109d8b965cda7db7.tar.gz
libunwind: Fix multilib header conflict - libunwind.h
libunwind.h conflicts between 32-bit and 64-bit versions This patch solves below error: -- snip -- file /usr/include/libunwind.h conflicts between attempted installs of libunwind-dev-1.2-r0.core2_64 and lib32-libunwind-dev-1.2-r0.i586 -- snip -- (From OE-Core rev: 6fdaf90fe9b8b2360f5a93752745bf248f9e289d) Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/libunwind/libunwind.inc6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-support/libunwind/libunwind.inc b/meta/recipes-support/libunwind/libunwind.inc
index ed32d19bfc..b9c532d3ad 100644
--- a/meta/recipes-support/libunwind/libunwind.inc
+++ b/meta/recipes-support/libunwind/libunwind.inc
@@ -5,7 +5,7 @@ LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://COPYING;beginline=3;md5=3fced11d6df719b47505837a51c16ae5" 5LIC_FILES_CHKSUM = "file://COPYING;beginline=3;md5=3fced11d6df719b47505837a51c16ae5"
6DEPENDS += "libatomic-ops" 6DEPENDS += "libatomic-ops"
7 7
8inherit autotools 8inherit autotools multilib_header
9 9
10PACKAGECONFIG ??= "" 10PACKAGECONFIG ??= ""
11PACKAGECONFIG[lzma] = "--enable-minidebuginfo,--disable-minidebuginfo,xz" 11PACKAGECONFIG[lzma] = "--enable-minidebuginfo,--disable-minidebuginfo,xz"
@@ -16,4 +16,8 @@ EXTRA_OECONF_aarch64 = "--enable-debug-frame"
16 16
17SECURITY_LDFLAGS_append_libc-musl = " -lssp_nonshared -lssp" 17SECURITY_LDFLAGS_append_libc-musl = " -lssp_nonshared -lssp"
18 18
19do_install_append () {
20 oe_multilib_header libunwind.h
21}
22
19BBCLASSEXTEND = "native" 23BBCLASSEXTEND = "native"