[oe-commits] : 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.

OE GIT Trial gittrial at amethyst.openembedded.net
Sat Aug 2 20:41:49 UTC 2008


Module: OE.dev
Branch: master
Commit: 076d6695ed4d644d877de1a1bf8cdd5d5caeb434
URL:    http://gitweb.openembedded.net//OE.dev.git/?a=commit;h=076d6695ed4d644d877de1a1bf8cdd5d5caeb434

Author:  <koen at openembedded.org>
Date:   Sat Aug  2 20:20:27 2008 +0000

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.

---

 packages/qt4/qt_staging.inc |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/packages/qt4/qt_staging.inc b/packages/qt4/qt_staging.inc
index 705ae14..de941df 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"





More information about the Openembedded-commits mailing list