summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-04-14 11:45:19 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-04-14 11:45:19 +0000
commite5488fab2f9fa40106165088bf81c91d76854249 (patch)
tree478a7ac7c7c7bdc8402db25480fa3f05fd16cd89
parent532f1e681477bc15f7f19308753d9f2d6e91b2a3 (diff)
parent9a7a995ebcbdaa1899d27b64a30462298106434a (diff)
merge of adbb0fa00fc14211e7902e17eb9ca516f0d13f44
and d21402039fbf5e29301a8367351ee97cf94887bf
-rw-r--r--packages/qt/qt4-x11-free_4.1.1.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/qt/qt4-x11-free_4.1.1.bb b/packages/qt/qt4-x11-free_4.1.1.bb
index 6c32026f38..755510cc7d 100644
--- a/packages/qt/qt4-x11-free_4.1.1.bb
+++ b/packages/qt/qt4-x11-free_4.1.1.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL QPL"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
DEPENDS = "uicmoc4-native qmake2-native freetype jpeg libx11 xft libxext libxrender libxrandr libxcursor"
PROVIDES = "qt4x11"
-PR = "r2"
+PR = "r4"
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
file://cross-compile.patch;patch=1 \
@@ -51,7 +51,7 @@ do_configure() {
ln -sf ${STAGING_BINDIR}/qmake2 bin/qmake
#rm -rf ./mkspecs
#ln -sf ${QMAKE_MKSPEC_PATH} ./mkspecs
- echo yes | ./configure -prefix / -crossarch ${ARCH} ${QT_CONFIG_FLAGS} -fast \
+ echo yes | ./configure -prefix / -platform ${TARGET_OS}-g++ -crossarch ${ARCH} ${QT_CONFIG_FLAGS} -fast \
-L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql
}