From: Holger Freyther <zecke@selfish.org>
Date: Sun, 23 Dec 2007 23:43:30 +0000 (+0000)
Subject: packages/qt4: Move QtopiaCore over to the qt4_arch.inc
X-Git-Tag: Release-2010-05/1~8080^2~36
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39dbfbe23ad2f6dc14244d27c08fd4979918bea4;p=openembedded.git

packages/qt4: Move QtopiaCore over to the qt4_arch.inc
---

diff --git a/packages/qt4/qte-functions.inc b/packages/qt4/qte-functions.inc
deleted file mode 100644
index f0ffb0e612..0000000000
--- a/packages/qt4/qte-functions.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-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
-
diff --git a/packages/qt4/qtopia-core_4.2.0.bb b/packages/qt4/qtopia-core_4.2.0.bb
index 509230f3ea..1e10fcde77 100644
--- a/packages/qt4/qtopia-core_4.2.0.bb
+++ b/packages/qt4/qtopia-core_4.2.0.bb
@@ -55,7 +55,7 @@ export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib"
 export OE_QMAKE_INCDIR_QTOPIA="${QTOPIADIR}/include"
 export OE_QMAKE_LIBDIR_QTOPIA="${QTOPIADIR}/lib"
 
-require qte-functions.inc
+require qt4_arch.inc
 QT_ARCH := "${@qte_arch(d)}"
 
 # FIXME use info.bbclass once it has been commited
diff --git a/packages/qt4/qtopia-core_4.3.3.bb b/packages/qt4/qtopia-core_4.3.3.bb
index 2995988b42..0e94145df0 100644
--- a/packages/qt4/qtopia-core_4.3.3.bb
+++ b/packages/qt4/qtopia-core_4.3.3.bb
@@ -40,7 +40,7 @@ export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib"
 export OE_QMAKE_INCDIR_QTOPIA="${QTOPIADIR}/include"
 export OE_QMAKE_LIBDIR_QTOPIA="${QTOPIADIR}/lib"
 
-require qte-functions.inc
+require qt4_arch.inc
 QT_ARCH := "${@qte_arch(d)}"
 
 # FIXME use info.bbclass once it has been commited