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-15 06:27:19 -0700 |
| commit | 1cab8ef694a323b68fa2c5533dbd3f4968f8b4d6 (patch) | |
| tree | 7dd481ce2ce8dea211afe4a09e5f0bd26e54c53f | |
| parent | 0728b89b56b3630e2d2bd1b2f7a604ddad529983 (diff) | |
| download | poky-1cab8ef694a323b68fa2c5533dbd3f4968f8b4d6.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)
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>
| -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 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' | |||
| 58 | COMPATIBLE_HOST_mipsarchn32 = 'null' | 58 | COMPATIBLE_HOST_mipsarchn32 = 'null' |
| 59 | COMPATIBLE_HOST_mipsarchr6 = 'null' | 59 | COMPATIBLE_HOST_mipsarchr6 = 'null' |
| 60 | 60 | ||
| 61 | inherit autotools ptest | 61 | inherit autotools ptest multilib_header |
| 62 | 62 | ||
| 63 | EXTRA_OECONF = "--enable-tls --without-mpicc" | 63 | EXTRA_OECONF = "--enable-tls --without-mpicc" |
| 64 | EXTRA_OECONF += "${@['--enable-only32bit','--enable-only64bit'][d.getVar('SITEINFO_BITS') != '32']}" | 64 | EXTRA_OECONF += "${@['--enable-only32bit','--enable-only64bit'][d.getVar('SITEINFO_BITS') != '32']}" |
| @@ -91,6 +91,7 @@ do_configure_prepend () { | |||
| 91 | 91 | ||
| 92 | do_install_append () { | 92 | do_install_append () { |
| 93 | install -m 644 ${B}/default.supp ${D}/${libdir}/valgrind/ | 93 | install -m 644 ${B}/default.supp ${D}/${libdir}/valgrind/ |
| 94 | oe_multilib_header valgrind/config.h | ||
| 94 | } | 95 | } |
| 95 | 96 | ||
| 96 | TUNE = "${@strip_mcpu(d)}" | 97 | TUNE = "${@strip_mcpu(d)}" |
