mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-18 12:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

base and sanity bbclasses + qemu: move gcc3 availability checking into base.bbclass

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3402 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Marcin Juszkiewicz
2008-01-03 14:07:44 +00:00
parent 67eaa28a3d
commit 66ff85a048
3 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
meta/classes/base.bbclass
View File

@@ -897,6 +897,23 @@ python () {
base_after_parse(d)
}
def check_app_exists(app, d):
from bb import which, data
app = data.expand(app, d)
path = data.getVar('PATH', d)
return len(which(path, app)) != 0
def check_gcc3(data):
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'
for gcc3 in gcc3_versions.split():
if check_app_exists(gcc3, data):
return gcc3
return False
# Patch handling
inherit patch

10
meta/classes/sanity.bbclass
View File

@@ -24,14 +24,6 @@ def check_conf_exists(fn, data):
return True
return False
def check_app_exists(app, d):
from bb import which, data
app = data.expand(app, d)
path = data.getVar('PATH', d)
return len(which(path, app)) != 0
def check_sanity(e):
from bb import note, error, data, __version__
from bb.event import Handled, NotHandled, getName
@@ -96,7 +88,7 @@ def check_sanity(e):
if "qemu-native" not in assume_provided:
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':
if not check_gcc3(e.data) and gcc_version[0] != '3':
missing = missing + "gcc-3.x (needed for qemu-native),"
else:
required_utilities = required_utilities + " qemu-arm"

17
meta/packages/qemu/qemu-gcc3-check.inc
View File

@@ -4,19 +4,8 @@ python __anonymous() {
path = data.getVar('PATH', d, 1)
oldOeConf = data.getVar('EXTRA_OECONF', d, 1)
if not oldOeConf: oldOeConf = ""
if len(which(path, 'gcc-3.4.4')) != 0:
data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.4.4", d)
elif len(which(path, 'gcc-3.4')) != 0:
data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.4", d)
elif len(which(path, 'gcc34')) != 0:
data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc34", d)
elif len(which(path, 'gcc33')) != 0:
data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc33", d)
elif len(which(path, 'gcc-3.3')) != 0:
data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.3", d)
elif len(which(path, 'gcc-3.3.6')) != 0:
data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.3.6", d)
elif len(which(path, 'gcc-3.4.6')) != 0:
data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.4.6", d)
gcc3 = check_gcc3(d)
if gcc3:
data.setVar('EXTRA_OECONF', oldOeConf + " --cc=" + gcc3, d)
}