[oe-commits] org.oe.dev qt 4.3.0: more fixes

[polyonymous commit]

qt 4.3.0: more fixes
- adjusted staging as to actually build qt-based apps.
- minor fix in install

Author: polyonymous at openembedded.org
Branch: org.openembedded.dev
Revision: 6f561d859809d8ecf2f630fa156e48ff01eec95e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=6f561d859809d8ecf2f630fa156e48ff01eec95e
Files:
1
packages/qt/qt4-x11-free_4.3.0.bb
Diffs:

#
# mt diff -r2e300a0ae23a9422b555b54b4b43d52abfe68e20 -r6f561d859809d8ecf2f630fa156e48ff01eec95e
#
# 
# 
# patch "packages/qt/qt4-x11-free_4.3.0.bb"
#  from [a3d384a818163b14fb463ff6b7efa40460275517]
#    to [7f1ba8d7500083f3b465bf4373fe4da0d17b1cc6]
# 
============================================================
--- packages/qt/qt4-x11-free_4.3.0.bb	a3d384a818163b14fb463ff6b7efa40460275517
+++ packages/qt/qt4-x11-free_4.3.0.bb	7f1ba8d7500083f3b465bf4373fe4da0d17b1cc6
@@ -51,11 +51,11 @@ do_configure() {
 	echo "DEFINES += QT_NO_XIM" >>src/qbase.pri
 	unset QMAKESPEC
 	ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake
-	ln -sf ./linux-g++ mkspecs/linux-gnueabi-g++
+	ln -s linux-g++ mkspecs/${TARGET_OS}-oe-g++
 	#export QMAKESPEC="linux-oe-g++"
 	#rm -rf ./mkspecs
 	#ln -sf ${QMAKE_MKSPEC_PATH} ./mkspecs
-	echo yes | ./configure -prefix / -platform ${TARGET_OS}-g++ -crossarch ${QT_ARCH} ${QT_CONFIG_FLAGS} -fast \
+	echo yes | ./configure -prefix / -platform ${TARGET_OS}-oe-g++ -crossarch ${QT_ARCH} ${QT_CONFIG_FLAGS} -fast \
 		-L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql
 }
 
@@ -85,6 +85,7 @@ do_stage() {
 	install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${STAGING_QT_DIR}/bin/rcc
 	install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${STAGING_QT_DIR}/bin/moc
 	install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${STAGING_QT_DIR}/bin/uic
+	sed -i -e 's,^QMAKE_RPATHDIR.*,QMAKE_RPATHDIR=${STAGING_QT_DIR}/lib,g'  ${STAGING_QT_DIR}/mkspecs/qconfig.pri
 }
 
 # FIXME: Might want to call oe_runmake install INSTALL_ROOT=${D}/${prefix} as well...
@@ -97,7 +98,7 @@ do_install() {
 	do
 		oe_libinstall -so -C lib libQt$part ${D}${libdir}
 	done
-	oe_libinstall -a -C lib libQtUiTools ${STAGING_QT_DIR}
+	oe_libinstall -a -C lib libQtUiTools ${D}${libdir}
 	cp -pPR include/* ${D}${includedir}
 	cp -pPR plugins ${D}${libdir}
 	cp -pPR bin/* ${D}${bindir}