From deb50c8b70a08632e779db9ee60d3f2d655fd3aa Mon Sep 17 00:00:00 2001 From: Roman I Khimov Date: Wed, 29 Apr 2009 23:57:54 +0400 Subject: coreutils-native: make mandatory dep for all packages Gives us guaranteed sane GNU coreutils on any host. Should greatly ease support for various non-GNU host systems and allow to safely remove some other native packages like 'install-native'. Acked-by: Otavio Salvador --- classes/base.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'classes/base.bbclass') diff --git a/classes/base.bbclass b/classes/base.bbclass index e5fd814b25..270b05d11e 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 -- cgit v1.2.3 From 714bed6ab1174ec126ea7d8c8655d1cfd6900325 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sun, 3 May 2009 19:23:57 -0400 Subject: base.bbclass: check_gcc3 needs to check for gcc-3.4.6 first. Comment on what this function is used for primarily. The default gcc3-native that we build is called 'gcc-3.4.6' so look for that one first. --- classes/base.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'classes/base.bbclass') diff --git a/classes/base.bbclass b/classes/base.bbclass index 270b05d11e..0baf0e0288 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -1236,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): -- cgit v1.2.3