diff options
| -rw-r--r-- | qte/qte_2.3.7.oe | 14 | ||||
| -rw-r--r-- | qte/qte_2.3.8-snap.oe | 14 |
2 files changed, 22 insertions, 6 deletions
diff --git a/qte/qte_2.3.7.oe b/qte/qte_2.3.7.oe index b236458416..d17925a70d 100644 --- a/qte/qte_2.3.7.oe +++ b/qte/qte_2.3.7.oe @@ -13,6 +13,13 @@ S = "${WORKDIR}/qt-${PV}" export QTDIR = "${S}" +def qte_os(d): + import oe, re + arch = oe.data.getVar('TARGET_OS', d, 1) + if re.match("^linux-uclibc$", arch): + arch = "linux" + return arch + def qte_arch(d): import oe, re arch = oe.data.getVar('TARGET_ARCH', d, 1) @@ -22,12 +29,13 @@ def qte_arch(d): arch = "x86" return arch +QTE_OS := "${@qte_os(d)}" QTE_ARCH := "${@qte_arch(d)}" EXTRA_OECONF_CONFIG = "-qconfig qpe" -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++" +EXTRA_OECONF_ARCH = "-xplatform ${QTE_OS}-${QTE_ARCH}-g++" +EXTRA_OECONF_ARCH_collie = "-xplatform ${QTE_OS}-sharp-g++" +EXTRA_OECONF_ARCH_ramses = "-xplatform ${QTE_OS}-ramses-g++" EXTRA_OECONF = "-system-jpeg -system-libpng -system-zlib -no-qvfb -no-xft -no-vnc -gif ${EXTRA_OECONF_ARCH} ${EXTRA_OECONF_CONFIG}" diff --git a/qte/qte_2.3.8-snap.oe b/qte/qte_2.3.8-snap.oe index 3864fd3d5a..812dbbc4eb 100644 --- a/qte/qte_2.3.8-snap.oe +++ b/qte/qte_2.3.8-snap.oe @@ -14,6 +14,13 @@ S = "${WORKDIR}/qt-${PV}shot-${SNAPDATE}" export QTDIR = "${S}" +def qte_os(d): + import oe, re + arch = oe.data.getVar('TARGET_OS', d, 1) + if re.match("^linux-uclibc$", arch): + arch = "linux" + return arch + def qte_arch(d): import oe, re arch = oe.data.getVar('TARGET_ARCH', d, 1) @@ -23,12 +30,13 @@ def qte_arch(d): arch = "x86" return arch +QTE_OS := "${@qte_os(d)}" QTE_ARCH := "${@qte_arch(d)}" EXTRA_OECONF_CONFIG = "-qconfig qpe" -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++" +EXTRA_OECONF_ARCH = "-xplatform ${QTE_OS}-${QTE_ARCH}-g++" +EXTRA_OECONF_ARCH_collie = "-xplatform ${QTE_OS}-sharp-g++" +EXTRA_OECONF_ARCH_ramses = "-xplatform ${QTE_OS}-ramses-g++" EXTRA_OECONF = "-system-jpeg -system-libpng -system-zlib -no-qvfb -no-xft -no-vnc -gif ${EXTRA_OECONF_ARCH} ${EXTRA_OECONF_CONFIG}" |