summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhang Xiao <xiao.zhang@windriver.com>2018-03-11 17:32:54 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-15 03:38:47 -0700
commit6084879306db61c347b6f01f3bb64de327a9052d (patch)
treeb1cfd4f705bd277e09001e10e208136e06f9a917
parent14c6e4fd793e037d801a81c6581e0642ef61ab0c (diff)
downloadopenembedded-core-6084879306db61c347b6f01f3bb64de327a9052d.tar.gz
valgrind: Fix multilib header conflict - valgrind/config.h
Header file conflict between 32-bit and 64-bit versions. Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-devtools/valgrind/valgrind_3.13.0.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb
index 5bd315aff0..9390d30444 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb
@@ -58,7 +58,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']}"
@@ -91,6 +91,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)}"