From 6fdaf90fe9b8b2360f5a93752745bf248f9e289d Mon Sep 17 00:00:00 2001 From: Jagadeesh Krishnanjanappa Date: Fri, 16 Feb 2018 19:19:12 +0530 Subject: 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 Signed-off-by: Ross Burton --- meta/recipes-support/libunwind/libunwind.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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" -- cgit 1.2.3-korg