From patchwork Sun May 15 12:07:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: qt4-native: build and install all needed qt4 tools Date: Sun, 15 May 2011 12:07:56 -0000 From: Simon Busch X-Patchwork-Id: 4089 Message-Id: <1305461276-27951-1-git-send-email-morphis@gravedo.de> To: openembedded-devel@lists.openembedded.org Without installing the qt4 binaries manually in do_install() the build process wants to use the qt4 binaries installed on the build host. If there are no qt4 tools installed on the build host the build fails. This patch brings the install lines which was removed by the move from qt4-tools-native to qt4-native. Signed-off-by: Simon Busch --- recipes/qt4/qt4-native.inc | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/recipes/qt4/qt4-native.inc b/recipes/qt4/qt4-native.inc index ee702e9..71ab1f2 100644 --- a/recipes/qt4/qt4-native.inc +++ b/recipes/qt4/qt4-native.inc @@ -6,7 +6,7 @@ PRIORITY = "optional" LICENSE = "GPL" PROVIDES = "qt4-tools-native" -INC_PR = "r0" +INC_PR = "r1" inherit native @@ -51,6 +51,11 @@ TOBUILD = "\ src/gui \ src/testlib \ src/qt3support \ + src/tools/uic3 \ + tools/linguist/lrelease \ + tools/linguist/lupdate \ + tools/qdbus/qdbusxml2cpp \ + tools/qdbus/qdbuscpp2xml \ " do_compile() { @@ -62,6 +67,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