aboutsummaryrefslogtreecommitdiff
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-26 15:06:25 +0100
commit1c2213fe1ac082288f366e4578d7a6e84410d820 (patch)
treea6298e3c19b47c34da276dcc20c56cb3ea75f5df
parent837f8df7bd5767e49ce59b2b1e5a4a65d1bfa276 (diff)
downloadopenembedded-core-1c2213fe1ac082288f366e4578d7a6e84410d820.zip
openembedded-core-1c2213fe1ac082288f366e4578d7a6e84410d820.tar.gz
openembedded-core-1c2213fe1ac082288f366e4578d7a6e84410d820.tar.bz2
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 <xiao.zhang@windriver.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>
-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 25b4126..bf3cfd7 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)}"