Switch back to using our own qemu binary for locale generation by default

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2424 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 7 insertions, 1 deletions

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 71dc26fa7d..2742dada7d 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -89,12 +89,18 @@ def check_sanity(e):
         if not check_app_exists('${BUILD_PREFIX}g++', e.data):
                 missing = missing + "C++ Compiler,"
 
-        required_utilities = "patch diffstat help2man texi2html cvs svn bzip2 tar gzip gawk makeinfo qemu-arm"
+        required_utilities = "patch diffstat help2man texi2html cvs svn bzip2 tar gzip gawk makeinfo"
 
         for util in required_utilities.split():
                 if not check_app_exists( util, e.data ):
                         missing = missing + "%s," % util
 
+        # qemu-native needs gcc 3.x
+        gcc_version = commands.getoutput("${BUILD_PREFIX}gcc --version | head -n 1 | cut -f 3 -d ' '")
+
+        if not check_app_exists('gcc-3.4', e.data) and not check_app_exists('gcc-3.3', e.data) and gcc_version[0] != '3':
+                missing = missing + "gcc-3.x (needed for qemu-native),"
+
         if missing != "":
                 missing = missing.rstrip(',')
                 messages = messages + "Please install following missing utilities: %s\n" % missing