Patchwork qt4-native: unbreak qt4 compilation by providing the necessary native tools

login
register
mail settings
Submitter Eric BENARD
Date May 13, 2011, 10:31 p.m.
Message ID <1305325912-14112-1-git-send-email-eric@eukrea.com>
Download mbox | patch
Permalink /patch/3995/
State Accepted
Headers show

Comments

Eric BENARD - May 13, 2011, 10:31 p.m.
was broken by commit 5a6efd58cdc85d08ab9e106c84bbac5110b5aecd

Signed-off-by: Eric BĂ©nard <eric@eukrea.com>
---
 recipes/qt4/qt4-native.inc |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

Patch

diff --git a/recipes/qt4/qt4-native.inc b/recipes/qt4/qt4-native.inc
index d99d9de..2156023 100644
--- a/recipes/qt4/qt4-native.inc
+++ b/recipes/qt4/qt4-native.inc
@@ -51,7 +51,10 @@  TOBUILD = "\
   src/gui \
   src/testlib \
   src/qt3support \
+  src/tools/uic3 \
   tools/linguist/lrelease \
+  tools/linguist/lupdate \
+  tools/qdbus \
 "
 
 do_compile() {
@@ -63,6 +66,18 @@  do_compile() {
 NATIVE_INSTALL_WORKS = "1"
 
 do_install() {
+    install -d ${D}${bindir}/
+    install -m 0755 bin/qmake ${D}${bindir}/qmake2
+    for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do
+        install -m 0755 bin/${i} ${D}${bindir}/${i}4
+    done
+
+    install -d ${D}${datadir}/qt4/
+    cp -PfR mkspecs ${D}${datadir}/qt4/
+    ln -sf linux-g++ ${D}${datadir}/qt4/mkspecs/${BUILD_OS}-oe-g++
+    cp -f ${WORKDIR}/g++.conf ${WORKDIR}/linux.conf ${D}${datadir}/qt4/mkspecs/common/
+    install -m 0644 tools/porting/src/q3porting.xml ${D}${datadir}/qt4/
+
     for i in ${TOBUILD}; do
         cd ${S}/$i && oe_runmake install INSTALL_ROOT=${D}
     done