diff options
author | Phil Blundell <philb@gnu.org> | 2011-07-14 16:24:51 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-19 17:34:19 +0100 |
commit | a17adf1c8ab6d806d74a23fecd8a293b0007c26e (patch) | |
tree | bd5d2dfac4a68e9bd6545b14e2b3783bfe91ae38 /meta | |
parent | 012c4a47ef259796faa82f10437cd81379e420ac (diff) | |
download | poky-a17adf1c8ab6d806d74a23fecd8a293b0007c26e.tar.gz |
sanity, base: remove gcc3 check since qemu doesn't need it any more
Recent versions of qemu seem to be happy enough building with gcc 4.x, and indeed most modern distributions aren't shipping gcc3 any more, so there is no point checking for its presence as part of sanity.
Also remove the check_gcc3 function from base since nothing else uses it.
(From OE-Core rev: ec5c68e9368111bd51c1cfd6a9a135c53b82ceca)
Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/base.bbclass | 10 | ||||
-rw-r--r-- | meta/classes/sanity.bbclass | 8 |
2 files changed, 0 insertions, 18 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 0c2c546925..3ca4e47767 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
@@ -397,16 +397,6 @@ python () { | |||
397 | bb.warn("Recipe %s is marked as only being architecture specific but seems to have machine specific packages?! The recipe may as well mark itself as machine specific directly." % d.getVar("PN", True)) | 397 | bb.warn("Recipe %s is marked as only being architecture specific but seems to have machine specific packages?! The recipe may as well mark itself as machine specific directly." % d.getVar("PN", True)) |
398 | } | 398 | } |
399 | 399 | ||
400 | def check_gcc3(data): | ||
401 | |||
402 | gcc3_versions = 'gcc-3.4.6 gcc-3.4.7 gcc-3.4 gcc34 gcc-3.4.4 gcc-3.3 gcc33 gcc-3.3.6 gcc-3.2 gcc32' | ||
403 | |||
404 | for gcc3 in gcc3_versions.split(): | ||
405 | if check_app_exists(gcc3, data): | ||
406 | return gcc3 | ||
407 | |||
408 | return False | ||
409 | |||
410 | addtask cleansstate after do_clean | 400 | addtask cleansstate after do_clean |
411 | python do_cleansstate() { | 401 | python do_cleansstate() { |
412 | sstate_clean_cachefiles(d) | 402 | sstate_clean_cachefiles(d) |
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index c9d37c9d88..716b15864e 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass | |||
@@ -211,14 +211,6 @@ def check_sanity(e): | |||
211 | 211 | ||
212 | required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk hg chrpath wget cpio" | 212 | required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk hg chrpath wget cpio" |
213 | 213 | ||
214 | # qemu-native needs gcc 3.x | ||
215 | if "qemu-native" not in assume_provided and "gcc3-native" in assume_provided: | ||
216 | gcc_version = commands.getoutput("${BUILD_PREFIX}gcc --version | head -n 1 | cut -f 3 -d ' '") | ||
217 | |||
218 | if not check_gcc3(e.data) and gcc_version[0] != '3': | ||
219 | messages = messages + "gcc3-native was in ASSUME_PROVIDED but the gcc-3.x binary can't be found in PATH" | ||
220 | missing = missing + "gcc-3.x (needed for qemu-native)," | ||
221 | |||
222 | if "qemu-native" in assume_provided: | 214 | if "qemu-native" in assume_provided: |
223 | if not check_app_exists("qemu-arm", e.data): | 215 | if not check_app_exists("qemu-arm", e.data): |
224 | messages = messages + "qemu-native was in ASSUME_PROVIDED but the QEMU binaries (qemu-arm) can't be found in PATH" | 216 | messages = messages + "qemu-native was in ASSUME_PROVIDED but the QEMU binaries (qemu-arm) can't be found in PATH" |