summaryrefslogtreecommitdiff
path: root/packages/qt4
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-08-02 20:20:27 +0000
committerKoen Kooi <koen@openembedded.org>2008-08-02 20:20:27 +0000
commit5ec40d0ce1120dba39a90864b8225b4a6f7a96f6 (patch)
tree8284abd40750016c5980832ad5403c5209a4d1f1 /packages/qt4
parent6fa5551719421e94f6528a2ab7738ba60a7f5bda (diff)
qt4_staging.inc: something in the qt build process hardcodes the tooldir to the target stagingdir, while the actual tools reside in the native target dir. Copy over the tools to work around this. This is a bandaid, the proper fix would be to use the newly gained crosscompile support in qt 4.4.1.
Diffstat (limited to 'packages/qt4')
-rw-r--r--packages/qt4/qt_staging.inc6
1 files changed, 6 insertions, 0 deletions
diff --git a/packages/qt4/qt_staging.inc b/packages/qt4/qt_staging.inc
index 705ae14f8d..de941df1df 100644
--- a/packages/qt4/qt_staging.inc
+++ b/packages/qt4/qt_staging.inc
@@ -15,6 +15,12 @@ do_stage_append() {
cd ${STAGING_LIBDIR}
sed -i s#"-L${S}/lib"##g libQt*.la
sed -i s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g libQt*.la
+
+ install -d ${STAGING_DIR_TARGET}/qt4/bin
+ cp ${STAGING_DIR_NATIVE}/qt4/bin/* ${STAGING_DIR_TARGET}/qt4/bin/
+ for qttool in ${STAGING_DIR_TARGET}/qt4/bin/*4 ; do
+ ln -sf $qttool ${STAGING_DIR_TARGET}/qt4/bin/$(basename $qttool |sed s:4::g)
+ done
}
STAGE_TEMP = "${WORKDIR}/temp-staging"