better arch selector for qte

BKrev: 40875fcb0JXbO50oAksMRdqa3c8hPw

diff --git a/qte/qte_2.3.6.oe b/qte/qte_2.3.6.oe
index 8088029..15404cd 100644 (file)
--- a/qte/qte_2.3.6.oe
+++ b/qte/qte_2.3.6.oe
@@ -20,10 +20,19 @@ S = "${WORKDIR}/qt-${PV}"
 
 export QTDIR = "${S}"
 
-ARCH_i686 = "x86"
+def qte_arch(d):
+       import oe, re
+       arch = oe.data.getVar('TARGET_ARCH', d, 1)
+       if re.match("^i.86$", arch):
+               arch = "x86"
+       elif arch == "x86_64":
+               arch = "x86"
+       return arch
+
+QTE_ARCH := "${@qte_arch(d)}"
 
 EXTRA_OECONF_CONFIG = "-qconfig qpe"
-EXTRA_OECONF_ARCH = "-xplatform ${TARGET_OS}-${TARGET_ARCH}-g++"
+EXTRA_OECONF_ARCH = "-xplatform ${TARGET_OS}-${QTE_ARCH}-g++"
 EXTRA_OECONF_ARCH_collie = "-xplatform ${TARGET_OS}-sharp-g++"
 EXTRA_OECONF_ARCH_ramses = "-xplatform ${TARGET_OS}-ramses-g++"
 

diff --git a/qte/qte_2.3.7.oe b/qte/qte_2.3.7.oe
index 320f239..2c85a94 100644 (file)
--- a/qte/qte_2.3.7.oe
+++ b/qte/qte_2.3.7.oe
@@ -20,11 +20,19 @@ S = "${WORKDIR}/qt-${PV}"
 
 export QTDIR = "${S}"
 
-ARCH_i686 = "x86"
-ARCH_x86_64 = "x86"
+def qte_arch(d):
+       import oe, re
+       arch = oe.data.getVar('TARGET_ARCH', d, 1)
+       if re.match("^i.86$", arch):
+               arch = "x86"
+       elif arch == "x86_64":
+               arch = "x86"
+       return arch
+
+QTE_ARCH := "${@qte_arch(d)}"
 
 EXTRA_OECONF_CONFIG = "-qconfig qpe"
-EXTRA_OECONF_ARCH = "-xplatform ${TARGET_OS}-${TARGET_ARCH}-g++"
+EXTRA_OECONF_ARCH = "-xplatform ${TARGET_OS}-${QTE_ARCH}-g++"
 EXTRA_OECONF_ARCH_collie = "-xplatform ${TARGET_OS}-sharp-g++"
 EXTRA_OECONF_ARCH_ramses = "-xplatform ${TARGET_OS}-ramses-g++"
 

diff --git a/qte/qte_2.3.8-snap.oe b/qte/qte_2.3.8-snap.oe
index 7ec5141..bfa806f 100644 (file)
--- a/qte/qte_2.3.8-snap.oe
+++ b/qte/qte_2.3.8-snap.oe
@@ -21,10 +21,19 @@ S = "${WORKDIR}/qt-${PV}shot-${SNAPDATE}"
 
 export QTDIR = "${S}"
 
-ARCH_i686 = "x86"
+def qte_arch(d):
+       import oe, re
+       arch = oe.data.getVar('TARGET_ARCH', d, 1)
+       if re.match("^i.86$", arch):
+               arch = "x86"
+       elif arch == "x86_64":
+               arch = "x86"
+       return arch
+
+QTE_ARCH := "${@qte_arch(d)}"
 
 EXTRA_OECONF_CONFIG = "-qconfig qpe"
-EXTRA_OECONF_ARCH = "-xplatform ${TARGET_OS}-${TARGET_ARCH}-g++"
+EXTRA_OECONF_ARCH = "-xplatform ${TARGET_OS}-${QTE_ARCH}-g++"
 EXTRA_OECONF_ARCH_collie = "-xplatform ${TARGET_OS}-sharp-g++"
 EXTRA_OECONF_ARCH_ramses = "-xplatform ${TARGET_OS}-ramses-g++"