summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
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:35 +0000
commit6fdaf90fe9b8b2360f5a93752745bf248f9e289d (patch)
treefe4aaa3420673949eb0c8c0640c8441daccb8887 /meta/recipes-support
parent47bcb610a1dac0e118c5ec756a748865c93bec4d (diff)
downloadopenembedded-core-6fdaf90fe9b8b2360f5a93752745bf248f9e289d.tar.gz
openembedded-core-6fdaf90fe9b8b2360f5a93752745bf248f9e289d.tar.bz2
openembedded-core-6fdaf90fe9b8b2360f5a93752745bf248f9e289d.zip
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 -- Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-support')
-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"
LIC_FILES_CHKSUM = "file://COPYING;beginline=3;md5=3fced11d6df719b47505837a51c16ae5"
DEPENDS += "libatomic-ops"
-inherit autotools
+inherit autotools multilib_header
PACKAGECONFIG ??= ""
PACKAGECONFIG[lzma] = "--enable-minidebuginfo,--disable-minidebuginfo,xz"
@@ -16,4 +16,8 @@ EXTRA_OECONF_aarch64 = "--enable-debug-frame"
SECURITY_LDFLAGS_append_libc-musl = " -lssp_nonshared -lssp"
+do_install_append () {
+ oe_multilib_header libunwind.h
+}
+
BBCLASSEXTEND = "native"