grr. real fix to allow QTE to build under uclibc

BKrev: 40972490RPuVavzX9IpLfJRX_94hhw

diff --git a/qte/qte_2.3.7.oe b/qte/qte_2.3.7.oe
index d17925a..06da21c 100644 (file)
--- a/qte/qte_2.3.7.oe
+++ b/qte/qte_2.3.7.oe
@@ -13,13 +13,6 @@ 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)
@@ -29,13 +22,12 @@ 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 ${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_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 = "-system-jpeg -system-libpng -system-zlib -no-qvfb -no-xft -no-vnc -gif ${EXTRA_OECONF_ARCH} ${EXTRA_OECONF_CONFIG}"
 
@@ -52,6 +44,10 @@ export SYSCONF_MOC = "${STAGING_BINDIR}/moc"
 export SYSCONF_UIC = "${STAGING_BINDIR}/uic"
 
 do_configure() {
+       for f in ${S}/configs/linux-*-g++-shared; do
+               sed -e 's,-linux-,-linux-uclibc-,g' < $f \
+                       > `echo $f | sed -e 's,linux-,linux-uclibc-,'`
+       done
        echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
 }
 

diff --git a/qte/qte_2.3.8-snap.oe b/qte/qte_2.3.8-snap.oe
index 812dbbc..5f5b705 100644 (file)
--- a/qte/qte_2.3.8-snap.oe
+++ b/qte/qte_2.3.8-snap.oe
@@ -14,13 +14,6 @@ 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)
@@ -30,13 +23,12 @@ 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 ${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_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 = "-system-jpeg -system-libpng -system-zlib -no-qvfb -no-xft -no-vnc -gif ${EXTRA_OECONF_ARCH} ${EXTRA_OECONF_CONFIG}"
 
@@ -53,6 +45,10 @@ export SYSCONF_MOC = "${STAGING_BINDIR}/moc"
 export SYSCONF_UIC = "${STAGING_BINDIR}/uic"
 
 do_configure() {
+    for f in ${S}/configs/linux-*-g++-shared; do
+        sed -e 's,-linux-,-linux-uclibc-,g' < $f \
+            > `echo $f | sed -e 's,linux-,linux-uclibc-,'`
+    done
     oenote ./configure ${EXTRA_OECONF}
     echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed"
 }