diff options
author | Zhang Xiao <xiao.zhang@windriver.com> | 2018-03-11 17:32:54 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-26 15:07:11 +0100 |
commit | e22a534bae7deec6185bbf4d58cd491b8e6e647e (patch) | |
tree | 52eacfeb85ff71758527e3cc786f12362749dc65 /meta | |
parent | 68fb7d153cb8a0981ecb0ea010e60446a73f46d4 (diff) | |
download | poky-e22a534bae7deec6185bbf4d58cd491b8e6e647e.tar.gz |
valgrind: Fix multilib header conflict - valgrind/config.h
Header file conflict between 32-bit and 64-bit versions.
(From OE-Core rev: 6084879306db61c347b6f01f3bb64de327a9052d)
(From OE-Core rev: 1c2213fe1ac082288f366e4578d7a6e84410d820)
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/valgrind/valgrind_3.13.0.bb | 3 |
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 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' | |||
57 | COMPATIBLE_HOST_mipsarchn32 = 'null' | 57 | COMPATIBLE_HOST_mipsarchn32 = 'null' |
58 | COMPATIBLE_HOST_mipsarchr6 = 'null' | 58 | COMPATIBLE_HOST_mipsarchr6 = 'null' |
59 | 59 | ||
60 | inherit autotools ptest | 60 | inherit autotools ptest multilib_header |
61 | 61 | ||
62 | EXTRA_OECONF = "--enable-tls --without-mpicc" | 62 | EXTRA_OECONF = "--enable-tls --without-mpicc" |
63 | EXTRA_OECONF += "${@['--enable-only32bit','--enable-only64bit'][d.getVar('SITEINFO_BITS') != '32']}" | 63 | EXTRA_OECONF += "${@['--enable-only32bit','--enable-only64bit'][d.getVar('SITEINFO_BITS') != '32']}" |
@@ -90,6 +90,7 @@ do_configure_prepend () { | |||
90 | 90 | ||
91 | do_install_append () { | 91 | do_install_append () { |
92 | install -m 644 ${B}/default.supp ${D}/${libdir}/valgrind/ | 92 | install -m 644 ${B}/default.supp ${D}/${libdir}/valgrind/ |
93 | oe_multilib_header valgrind/config.h | ||
93 | } | 94 | } |
94 | 95 | ||
95 | TUNE = "${@strip_mcpu(d)}" | 96 | TUNE = "${@strip_mcpu(d)}" |