summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-10-20 22:19:08 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-21 22:56:05 +0100
commitaccb59e07b68b57ee57e36cc6c66e36c46dab576 (patch)
tree1968b012be06b9520e0e529f462feb6ad4336f96
parentac1bc7d5a0cf1fe51ea563b6ae63795a8ee168e6 (diff)
downloadpoky-accb59e07b68b57ee57e36cc6c66e36c46dab576.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. (From OE-Core rev: 33960902b9c36575ddda3d926d70fa13bbad85f6) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/qemu/qemu/no-valgrind.patch19
-rw-r--r--meta/recipes-devtools/qemu/qemu_2.4.0.bb1
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 0000000000..91f728042d
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/no-valgrind.patch
@@ -0,0 +1,19 @@
1There isn't an option to enable or disable valgrind support, so disable it to avoid non-deterministic builds.
2
3Upstream-Status: Inappropriate
4Signed-off-by: Ross Burton <ross.burton@intel.com>
5
6diff --git a/configure b/configure
7index b3c4f51..4d3929e 100755
8--- a/configure
9+++ b/configure
10@@ -4193,9 +4192,0 @@ valgrind_h=no
11-cat > $TMPC << EOF
12-#include <valgrind/valgrind.h>
13-int main(void) {
14- return 0;
15-}
16-EOF
17-if compile_prog "" "" ; then
18- valgrind_h=yes
19-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 \
9 file://smc91c111_fix1.patch \ 9 file://smc91c111_fix1.patch \
10 file://smc91c111_fix2.patch \ 10 file://smc91c111_fix2.patch \
11 file://smc91c111_fix3.patch \ 11 file://smc91c111_fix3.patch \
12 file://no-valgrind.patch \
12 " 13 "
13SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2" 14SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2"
14SRC_URI[md5sum] = "186ee8194140a484a455f8e3c74589f4" 15SRC_URI[md5sum] = "186ee8194140a484a455f8e3c74589f4"