diff options
| author | Marcin Juszkiewicz <marcin@buglabs.net> | 2009-05-04 18:10:31 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin@buglabs.net> | 2009-05-04 18:10:31 +0200 |
| commit | 58104ee0f884c1fa927dc369ed691974f634fbef (patch) | |
| tree | eb05d4ac5a09cdbeb6b6e15934d8ca0a8632957b /classes/base.bbclass | |
| parent | 4303a5f5c6b5fe9a4ca7e59f5583edbe7b5a8668 (diff) | |
| parent | 714bed6ab1174ec126ea7d8c8655d1cfd6900325 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'classes/base.bbclass')
| -rw-r--r-- | classes/base.bbclass | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index e5fd814b25..0baf0e0288 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -125,9 +125,11 @@ def base_dep_prepend(d): # the case where host == build == target, for now we don't work in # that case though. # - deps = "shasum-native " - if bb.data.getVar('PN', d, True) == "shasum-native": + deps = "shasum-native coreutils-native" + if bb.data.getVar('PN', d, True) == "shasum-native" or bb.data.getVar('PN', d, True) == "stagemanager-native": deps = "" + if bb.data.getVar('PN', d, True) == "coreutils-native": + deps = "shasum-native" # INHIBIT_DEFAULT_DEPS doesn't apply to the patch command. Whether or not # we need that built is the responsibility of the patch function / class, not @@ -1234,8 +1236,11 @@ def check_app_exists(app, d): return len(which(path, app)) != 0 def check_gcc3(data): + # Primarly used by qemu to make sure we have a workable gcc-3.4.x. + # Start by checking for the program name as we build it, was not + # all host-provided gcc-3.4's will work. - gcc3_versions = 'gcc-3.4 gcc34 gcc-3.4.4 gcc-3.4.6 gcc-3.4.7 gcc-3.3 gcc33 gcc-3.3.6 gcc-3.2 gcc32' + gcc3_versions = 'gcc-3.4.6 gcc-3.4.4 gcc34 gcc-3.4.7 gcc-3.3 gcc33 gcc-3.3.6 gcc-3.2 gcc32' for gcc3 in gcc3_versions.split(): if check_app_exists(gcc3, data): |