diff options
| author |   Ross Burton <ross.burton@intel.com> | 2015-10-20 22:19:08 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-21 22:52:17 +0100 |
| commit | 33960902b9c36575ddda3d926d70fa13bbad85f6 (patch) | |
| tree | e152135adde245c2e0c1b01acc0093e034ba12ef /meta/recipes-devtools/qemu | |
| parent | e1837b51e4054a725ce01007f27544ee21db79ef (diff) | |
| download | openembedded-core-contrib-33960902b9c36575ddda3d926d70fa13bbad85f6.tar.gz | |
qemu: disable Valgrind
Qemu has an automatic dependency on valgrind which cannot be disabled, which
causes non-deterministic builds and build failures. As Valgrind wasn't enabled
previously make this deterministic by forcibly disabling it.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-devtools/qemu')
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu/no-valgrind.patch | 19 | ||||
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu_2.4.0.bb | 1 |
2 files changed, 20 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/no-valgrind.patch b/meta/recipes-devtools/qemu/qemu/no-valgrind.patch new file mode 100644 index 00000000000..91f728042d5 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/no-valgrind.patch @@ -0,0 +1,19 @@ +There isn't an option to enable or disable valgrind support, so disable it to avoid non-deterministic builds. + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton <ross.burton@intel.com> + +diff --git a/configure b/configure +index b3c4f51..4d3929e 100755 +--- a/configure ++++ b/configure +@@ -4193,9 +4192,0 @@ valgrind_h=no +-cat > $TMPC << EOF +-#include <valgrind/valgrind.h> +-int main(void) { +- return 0; +-} +-EOF +-if compile_prog "" "" ; then +- valgrind_h=yes +-fi diff --git a/meta/recipes-devtools/qemu/qemu_2.4.0.bb b/meta/recipes-devtools/qemu/qemu_2.4.0.bb index 59b17880075..1505b80a51e 100644 --- a/meta/recipes-devtools/qemu/qemu_2.4.0.bb +++ b/meta/recipes-devtools/qemu/qemu_2.4.0.bb @@ -9,6 +9,7 @@ SRC_URI += "file://configure-fix-Darwin-target-detection.patch \ file://smc91c111_fix1.patch \ file://smc91c111_fix2.patch \ file://smc91c111_fix3.patch \ + file://no-valgrind.patch \ " SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2" SRC_URI[md5sum] = "186ee8194140a484a455f8e3c74589f4" |