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>
Signed-off-by: Armin Kuster <akuster808@gmail.com>

diff --git a/meta/recipes-support/libunwind/libunwind.inc b/meta/recipes-support/libunwind/libunwind.inc
index ed32d19bfc97563bbf26385dde3fa0017400f0e5..b9c532d3ad247a22f95f4b2a86ca0ebb7b9c4115 100644 (file)
--- 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"