Rename gcc-native3 -> gcc3-native for consistency and update sanity.bbclass to account for gcc3 changes
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3670 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
parent
8f12b466e5
commit
48f8cda2c3
|
@ -94,7 +94,7 @@ TMPDIR = "${OEROOT}/build/tmp"
|
||||||
|
|
||||||
# Comment this out if you don't have a 3.x gcc version available and wish
|
# Comment this out if you don't have a 3.x gcc version available and wish
|
||||||
# poky to build one for you. The 3.x gcc is required to build qemu-native.
|
# poky to build one for you. The 3.x gcc is required to build qemu-native.
|
||||||
ASSUME_PROVIDED += "gcc-native3"
|
ASSUME_PROVIDED += "gcc3-native"
|
||||||
|
|
||||||
# Uncomment these two if you want BitBake to build images useful for debugging.
|
# Uncomment these two if you want BitBake to build images useful for debugging.
|
||||||
# DEBUG_BUILD = "1"
|
# DEBUG_BUILD = "1"
|
||||||
|
|
|
@ -85,12 +85,15 @@ def check_sanity(e):
|
||||||
required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk md5sum"
|
required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk md5sum"
|
||||||
|
|
||||||
# qemu-native needs gcc 3.x
|
# qemu-native needs gcc 3.x
|
||||||
if "qemu-native" not in assume_provided:
|
if "qemu-native" not in assume_provided and "gcc3-native" in assume_provided:
|
||||||
gcc_version = commands.getoutput("${BUILD_PREFIX}gcc --version | head -n 1 | cut -f 3 -d ' '")
|
gcc_version = commands.getoutput("${BUILD_PREFIX}gcc --version | head -n 1 | cut -f 3 -d ' '")
|
||||||
|
|
||||||
if not check_gcc3(e.data) and gcc_version[0] != '3':
|
if not check_gcc3(e.data) and gcc_version[0] != '3':
|
||||||
|
messages = messages + "gcc3-native was in ASSUME_PROVIDED but the gcc-3.x binary can't be found in PATH"
|
||||||
missing = missing + "gcc-3.x (needed for qemu-native),"
|
missing = missing + "gcc-3.x (needed for qemu-native),"
|
||||||
else:
|
|
||||||
|
if "qemu-native" in assume_provided:
|
||||||
|
messages = messages + "qemu-native was in ASSUME_PROVIDED but the QEMU binaries can't be found in PATH"
|
||||||
required_utilities = required_utilities + " qemu-arm"
|
required_utilities = required_utilities + " qemu-arm"
|
||||||
|
|
||||||
for util in required_utilities.split():
|
for util in required_utilities.split():
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
require gcc_${PV}.bb
|
require gcc_${PV}.bb
|
||||||
require gcc-native.inc
|
require gcc-native.inc
|
||||||
PROVIDES += "gcc-native3"
|
PROVIDES += "gcc3-native"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
inherit native
|
inherit native
|
||||||
|
|
||||||
DEPENDS = "zlib-native gcc-native3"
|
DEPENDS = "zlib-native gcc3-native"
|
||||||
|
|
||||||
require qemu-gcc3-check.inc
|
require qemu-gcc3-check.inc
|
||||||
|
|
Loading…
Reference in New Issue