[oe-commits] org.oe.dev qte/qtopia-core: factor out qte_arch function into qte-functions.inc, use this from qtopia-core to get QT_ARCH

[mickeyl commit]

qte/qtopia-core: factor out qte_arch function into qte-functions.inc, use this from qtopia-core to get QT_ARCH

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 5b49fef60628e4779e1e1eae187db765c4198938
ViewMTN: http://monotone.openembedded.org/revision.psp?id=5b49fef60628e4779e1e1eae187db765c4198938
Files:
1
packages/qte/qte-functions.inc
packages/qte/qte-common_2.3.10.inc
packages/qte/qtopia-core_4.2.0.bb
Diffs:

#
# mt diff -r012a3e436463712be71aa0a19c8a3d4db55151df -r5b49fef60628e4779e1e1eae187db765c4198938
#
# 
# 
# add_file "packages/qte/qte-functions.inc"
#  content [afe3c775da72d222b8e976782309264afb5cbf6e]
# 
# patch "packages/qte/qte-common_2.3.10.inc"
#  from [b0451f293f50906a79eff6ab8732f59d95ea6b10]
#    to [6ac1ed6362b2dfecf8b3124f975ad971bfdc388f]
# 
# patch "packages/qte/qtopia-core_4.2.0.bb"
#  from [5030728633d842f93a8e23d6ca34c0cf92ec0416]
#    to [5e0afa0d27cf862f1eeb60e223952ea6718db390]
# 
============================================================
--- packages/qte/qte-functions.inc	afe3c775da72d222b8e976782309264afb5cbf6e
+++ packages/qte/qte-functions.inc	afe3c775da72d222b8e976782309264afb5cbf6e
@@ -0,0 +1,11 @@
+def qte_arch(d):
+        import bb, re
+        arch = bb.data.getVar('TARGET_ARCH', d, 1)
+        if re.match("^i.86$", arch):
+                arch = "x86"
+        elif arch == "x86_64":
+                arch = "x86"
+        elif arch == "mipsel":
+                arch = "mips"
+        return arch
+
============================================================
--- packages/qte/qte-common_2.3.10.inc	b0451f293f50906a79eff6ab8732f59d95ea6b10
+++ packages/qte/qte-common_2.3.10.inc	6ac1ed6362b2dfecf8b3124f975ad971bfdc388f
@@ -69,17 +69,7 @@ export QTDIR = "${S}"
 S = "${WORKDIR}/qt-${PV}"
 export QTDIR = "${S}"
 
-def qte_arch(d):
-	import bb, re
-	arch = bb.data.getVar('TARGET_ARCH', d, 1)
-	if re.match("^i.86$", arch):
-		arch = "x86"
-	elif arch == "x86_64":
-		arch = "x86"
-	elif arch == "mipsel":
-		arch = "mips"
-	return arch
-
+require qte-functions.inc
 QTE_ARCH := "${@qte_arch(d)}"
 
 #
============================================================
--- packages/qte/qtopia-core_4.2.0.bb	5030728633d842f93a8e23d6ca34c0cf92ec0416
+++ packages/qte/qtopia-core_4.2.0.bb	5e0afa0d27cf862f1eeb60e223952ea6718db390
@@ -1,10 +1,10 @@ DEPENDS = "glib-2.0 dbus-glib tslib"
 DESCRIPTION = "Qtopia Core (aka: Qt/Embedded)"
 SECTION = "libs"
 LICENSE = "GPL"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 DEPENDS = "glib-2.0 dbus-glib tslib"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \
            file://linux-oe-qmake.conf"
@@ -55,11 +55,10 @@ export OE_QMAKE_LIBDIR_QTOPIA="${QTOPIAD
 export OE_QMAKE_INCDIR_QTOPIA="${QTOPIADIR}/include"
 export OE_QMAKE_LIBDIR_QTOPIA="${QTOPIADIR}/lib"
 
+require qte-functions.inc
+QT_ARCH := "${@qte_arch(d)}"
 
-# FIXME
-# We should have architecture detection here and translate it to the correct
-# Qtopia -embedded switch
-QT_ARCH = "arm"
+# FIXME use info.bbclass once it has been commited
 QT_ENDIAN = "-little-endian"
 
 # We don't build the examples and demos atm. They're quite big and not used
@@ -70,7 +69,6 @@ QT_CONFIG_FLAGS = "-release \
 	-nomake demos -nomake examples -nomake tools \
 	-qt-mouse-tslib"
 
-
 # We might want to package all the libraries separately, so you can really
 # fine-tune what to install. This is e.g. done in qt4-x11-free_4.1.2.bb.
 # What should these packages be called? I'm tempted to call them the same