qemu: factor out gcc3 check function and include it

diff --git a/packages/qemu/qemu-gcc3-check.inc b/packages/qemu/qemu-gcc3-check.inc
new file mode 100644 (file)
index 0000000..96b79fd
--- /dev/null
+++ b/packages/qemu/qemu-gcc3-check.inc
@@ -0,0 +1,20 @@
+python __anonymous() {
+    from bb import which, data
+
+    path = data.getVar('PATH', d)
+    oldOeConf = data.getVar('EXTRA_OECONF', d)
+    if not oldOeConf: oldOeConf = ""
+    if 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)
+}
+

diff --git a/packages/qemu/qemu-native.inc b/packages/qemu/qemu-native.inc
index 81f0944..f97e031 100644 (file)
--- a/packages/qemu/qemu-native.inc
+++ b/packages/qemu/qemu-native.inc
@@ -2,25 +2,7 @@ FILESPATH =. "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qemu-${PV}:"
 # prefix = "${STAGING_DIR}/${BUILD_SYS}"
 DEPENDS = "libsdl-native zlib-native"
 
-python __anonymous() {
-    from bb import which, data
-       
-    path = data.getVar('PATH', d)
-    oldOeConf = data.getVar('EXTRA_OECONF', d)
-    if not oldOeConf: oldOeConf = ""
-    if 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)
-}
+require qemu-gcc3-check.inc
 
 do_stage() {
        find . -name "qemu-*" -type f -perm -755 -exec install -m 0755 {} ${STAGING_BINDIR} \;

diff --git a/packages/qemu/qemu-native_20070613.bb b/packages/qemu/qemu-native_20070613.bb
index f040280..88c944a 100644 (file)
--- a/packages/qemu/qemu-native_20070613.bb
+++ b/packages/qemu/qemu-native_20070613.bb
@@ -3,18 +3,5 @@ inherit native
 DEPENDS = "zlib-native"
 prefix = "${STAGING_DIR}/${BUILD_SYS}"
 
-python __anonymous() {
-    from bb import which, data
-       
-    path = data.getVar('PATH', d)
-    oeconf = data.getVar('EXTRA_OECONF', d) or ''
-    if len(which(path, 'gcc-3.4.6')) != 0:
-        data.setVar('EXTRA_OECONF', oeconf + " --cc=gcc-3.4.6", d)
-    elif len(which(path, 'gcc-3.4')) != 0:
-        data.setVar('EXTRA_OECONF', oeconf + " --cc=gcc-3.4", d)
-    elif len(which(path, 'gcc34')) != 0:
-        data.setVar('EXTRA_OECONF', oeconf + " --cc=gcc34", d)
-    elif len(which(path, 'gcc-3.3')) != 0:
-        data.setVar('EXTRA_OECONF', oeconf + " --cc=gcc-3.3", d)
-    #data.setVarFlag('PKG_CONFIG_PATH', 'unexport', '1', d)
-}
+require qemu-gcc3-check.inc
+