From 33960902b9c36575ddda3d926d70fa13bbad85f6 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 20 Oct 2015 22:19:08 +0100 Subject: 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 --- meta/recipes-devtools/qemu/qemu/no-valgrind.patch | 19 +++++++++++++++++++ meta/recipes-devtools/qemu/qemu_2.4.0.bb | 1 + 2 files changed, 20 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/no-valgrind.patch 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 0000000000..91f728042d --- /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 + +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 +-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 59b1788007..1505b80a51 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" -- cgit 1.2.3-korg