[oe-commits] org.oe.dev qemu: factor out gcc3 check function and include it

[mickeyl commit]

qemu: factor out gcc3 check function and include it

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 3b73bd5ada8f044f5d14445933e426ec92ff9f9e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=3b73bd5ada8f044f5d14445933e426ec92ff9f9e
Files:
1
packages/qemu/qemu-gcc3-check.inc
packages/qemu/qemu-native.inc
packages/qemu/qemu-native_20070613.bb
Diffs:

#
# mt diff -r57097c5f7112c41b7466c7f14c1b99593a6d65ae -r3b73bd5ada8f044f5d14445933e426ec92ff9f9e
#
# 
# 
# add_file "packages/qemu/qemu-gcc3-check.inc"
#  content [2e11e76ecd0c388cdcfd1319c8601c429ba5888e]
# 
# patch "packages/qemu/qemu-native.inc"
#  from [740a86de6db274cb5c05df97968b02f1bc33a4cf]
#    to [22b8987bdaa1e51e0eaff486b9303f0957b086d5]
# 
# patch "packages/qemu/qemu-native_20070613.bb"
#  from [342f872dda508387c0cfd231275c9f7fa10f3a9e]
#    to [750dd1e695e2d0105b93941f87c372ddd4f9f0a1]
# 
============================================================
--- packages/qemu/qemu-gcc3-check.inc	2e11e76ecd0c388cdcfd1319c8601c429ba5888e
+++ packages/qemu/qemu-gcc3-check.inc	2e11e76ecd0c388cdcfd1319c8601c429ba5888e
@@ -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)
+}
+
============================================================
--- packages/qemu/qemu-native.inc	740a86de6db274cb5c05df97968b02f1bc33a4cf
+++ packages/qemu/qemu-native.inc	22b8987bdaa1e51e0eaff486b9303f0957b086d5
@@ -1,26 +1,8 @@ DEPENDS = "libsdl-native zlib-native"
 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} \;
============================================================
--- packages/qemu/qemu-native_20070613.bb	342f872dda508387c0cfd231275c9f7fa10f3a9e
+++ packages/qemu/qemu-native_20070613.bb	750dd1e695e2d0105b93941f87c372ddd4f9f0a1
@@ -1,20 +1,7 @@ prefix = "${STAGING_DIR}/${BUILD_SYS}"
 require qemu_${PV}.bb
 inherit native
 DEPENDS = "zlib-native"
 prefix = "${STAGING_DIR}/${BUILD_SYS}"
 
+require qemu-gcc3-check.inc
+
-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)
-}