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

[koen commit]

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.

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: e7877fb9e5d6fe166efa6973b930549f64b7bccb
ViewMTN: http://monotone.openembedded.org/revision/info/e7877fb9e5d6fe166efa6973b930549f64b7bccb
Files:
1
packages/qt4/qt_staging.inc
Diffs:

#
# mt diff -rccb7f1f9255a881fe31045e96a80be35d59827a8 -re7877fb9e5d6fe166efa6973b930549f64b7bccb
#
#
#
# patch "packages/qt4/qt_staging.inc"
#  from [47a145dc6e238d6fffdbd1cfa27edaa0e623d3ef]
#    to [f35c509913b9b43e11838625fb843e06d4ea182e]
#
============================================================
--- packages/qt4/qt_staging.inc	47a145dc6e238d6fffdbd1cfa27edaa0e623d3ef
+++ packages/qt4/qt_staging.inc	f35c509913b9b43e11838625fb843e06d4ea182e
@@ -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"