diff options
author | Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> | 2018-02-16 19:19:12 +0530 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-02-27 15:51:03 +0000 |
commit | 2c60d1b0ddfe0ef89aa5416db718647c2c51f746 (patch) | |
tree | 5852635ce4fdb7580c961baf6e756684fbf82dd6 /meta/recipes-support | |
parent | 985609ed8f15e0ce13ceedbd876f598bc3d4df56 (diff) | |
download | poky-2c60d1b0ddfe0ef89aa5416db718647c2c51f746.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)
(From OE-Core rev: f2170de280fa0903aadd5b36a2fb3d317ebac502)
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>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/libunwind/libunwind.inc | 6 |
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" | |||
5 | LIC_FILES_CHKSUM = "file://COPYING;beginline=3;md5=3fced11d6df719b47505837a51c16ae5" | 5 | LIC_FILES_CHKSUM = "file://COPYING;beginline=3;md5=3fced11d6df719b47505837a51c16ae5" |
6 | DEPENDS += "libatomic-ops" | 6 | DEPENDS += "libatomic-ops" |
7 | 7 | ||
8 | inherit autotools | 8 | inherit autotools multilib_header |
9 | 9 | ||
10 | PACKAGECONFIG ??= "" | 10 | PACKAGECONFIG ??= "" |
11 | PACKAGECONFIG[lzma] = "--enable-minidebuginfo,--disable-minidebuginfo,xz" | 11 | PACKAGECONFIG[lzma] = "--enable-minidebuginfo,--disable-minidebuginfo,xz" |
@@ -16,4 +16,8 @@ EXTRA_OECONF_aarch64 = "--enable-debug-frame" | |||
16 | 16 | ||
17 | SECURITY_LDFLAGS_append_libc-musl = " -lssp_nonshared -lssp" | 17 | SECURITY_LDFLAGS_append_libc-musl = " -lssp_nonshared -lssp" |
18 | 18 | ||
19 | do_install_append () { | ||
20 | oe_multilib_header libunwind.h | ||
21 | } | ||
22 | |||
19 | BBCLASSEXTEND = "native" | 23 | BBCLASSEXTEND = "native" |