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 (file)
index f0ffb0e..0000000
--- 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 509230f..1e10fcd 100644 (file)
--- 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 2995988..0e94145 100644 (file)
--- 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