[gnome-continuous-yocto/gnomeostree-3.28-rocko: 155/218] libunwind: Fix multilib header conflict - libunwind.h

[Emmanuele Bassi <ebassi src gnome org>]

commit 2c60d1b0ddfe0ef89aa5416db718647c2c51f746
Author: Jagadeesh Krishnanjanappa <jkrishnanjanappa mvista com>
Date:   Fri Feb 16 19:19:12 2018 +0530

    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>

 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 ed32d19..b9c532d 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"