diff options
| author | Gerald Britton <gbritton@doomcom.org> | 2004-04-22 06:01:47 +0000 |
|---|---|---|
| committer | Gerald Britton <gbritton@doomcom.org> | 2004-04-22 06:01:47 +0000 |
| commit | feceec6a7565b18d5b58d113c1368f8cc10d548a (patch) | |
| tree | deeac782b374e045ac12c71d2329c78004ade782 | |
| parent | c8392fad1513f3f3a83b128144176884741733ac (diff) | |
better arch selector for qte
BKrev: 40875fcb0JXbO50oAksMRdqa3c8hPw
| -rw-r--r-- | qte/qte_2.3.6.oe | 13 | ||||
| -rw-r--r-- | qte/qte_2.3.7.oe | 14 | ||||
| -rw-r--r-- | qte/qte_2.3.8-snap.oe | 13 |
3 files changed, 33 insertions, 7 deletions
diff --git a/qte/qte_2.3.6.oe b/qte/qte_2.3.6.oe index 808802990f..15404cdf83 100644 --- 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 320f239ccf..2c85a946eb 100644 --- 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 7ec51416e8..bfa806ff6d 100644 --- 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++" |