From 1c2213fe1ac082288f366e4578d7a6e84410d820 Mon Sep 17 00:00:00 2001 From: Zhang Xiao Date: Sun, 11 Mar 2018 17:32:54 -0700 Subject: valgrind: Fix multilib header conflict - valgrind/config.h Header file conflict between 32-bit and 64-bit versions. (From OE-Core rev: 6084879306db61c347b6f01f3bb64de327a9052d) Signed-off-by: Zhang Xiao Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/recipes-devtools/valgrind/valgrind_3.13.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb index 25b412662a..bf3cfd7f36 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb @@ -57,7 +57,7 @@ COMPATIBLE_HOST_linux-muslx32 = 'null' COMPATIBLE_HOST_mipsarchn32 = 'null' COMPATIBLE_HOST_mipsarchr6 = 'null' -inherit autotools ptest +inherit autotools ptest multilib_header EXTRA_OECONF = "--enable-tls --without-mpicc" EXTRA_OECONF += "${@['--enable-only32bit','--enable-only64bit'][d.getVar('SITEINFO_BITS') != '32']}" @@ -90,6 +90,7 @@ do_configure_prepend () { do_install_append () { install -m 644 ${B}/default.supp ${D}/${libdir}/valgrind/ + oe_multilib_header valgrind/config.h } TUNE = "${@strip_mcpu(d)}" -- cgit 1.2.3-korg