[oe-commits] org.oe.dev base and sanity bbclasses + qemu: move gcc3 availability checking into base.bbclass (from Poky)

[hrw commit]

base and sanity bbclasses + qemu: move gcc3 availability checking into base.bbclass (from Poky)

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 0d7f35f44f5002f7df5f605bc373d3feecb8602d
ViewMTN: http://monotone.openembedded.org/revision/info/0d7f35f44f5002f7df5f605bc373d3feecb8602d
Files:
1
classes/base.bbclass
classes/sanity.bbclass
packages/qemu/qemu-gcc3-check.inc
Diffs:

#
# mt diff -r274270bd49f45e5d154a09560078fd8473cebef3 -r0d7f35f44f5002f7df5f605bc373d3feecb8602d
#
# 
# 
# patch "classes/base.bbclass"
#  from [5efb30de935081fe56703b6432d636a3668d4823]
#    to [d034cdab57388cbe9087fb1c8dfd47a162e139de]
# 
# patch "classes/sanity.bbclass"
#  from [a81f2a3b9cc1e0daf9c88d6874dd369ef2c660b5]
#    to [ebf6cc13d544c4d677c13e3ea8dd18655c21e172]
# 
# patch "packages/qemu/qemu-gcc3-check.inc"
#  from [ab9405e1e7f0697d39ad932818e4d113c0fbd3ea]
#    to [d7b22bce39e0bfb99c296b0873ef8d1dea0d0aff]
# 
============================================================
--- classes/base.bbclass	5efb30de935081fe56703b6432d636a3668d4823
+++ classes/base.bbclass	d034cdab57388cbe9087fb1c8dfd47a162e139de
@@ -902,6 +902,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
 
============================================================
--- classes/sanity.bbclass	a81f2a3b9cc1e0daf9c88d6874dd369ef2c660b5
+++ classes/sanity.bbclass	ebf6cc13d544c4d677c13e3ea8dd18655c21e172
@@ -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
============================================================
--- packages/qemu/qemu-gcc3-check.inc	ab9405e1e7f0697d39ad932818e4d113c0fbd3ea
+++ packages/qemu/qemu-gcc3-check.inc	d7b22bce39e0bfb99c296b0873ef8d1dea0d0aff
@@ -1,22 +1,11 @@ python __anonymous() {
 python __anonymous() {
     from bb import which, data
 
     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)
 }