diff options
| author |   Holger Freyther <zecke@selfish.org> | 2007-12-25 00:27:53 +0000 |
|---|---|---|
| committer | Holger Freyther <zecke@selfish.org> | 2007-12-25 00:27:53 +0000 |
| commit | 7c023dc83c4fa8193fdd8513f5ce9b8c0ae68d96 (patch) | |
| tree | 75614ca2c329eb2b1f1f3d35415bd174622eb62e /packages/qmake/qmake2-native.inc | |
| parent | 79e6dae1cb3b5367da8d375fa1cf2f8480b64e6e (diff) | |
| download | openembedded-7c023dc83c4fa8193fdd8513f5ce9b8c0ae68d96.tar.gz | |
packages/qmake/qmake2-native.inc: Install the specs only once, add a patch to change the prefixes at runtime
qmake has built-in paths. When building qmake2-native we have a pretty boring path
which is certainly wrong for qt/x11 and qt/embedded. So we need a way to change this
path at runtime. We just need to point qmake to a qt.conf and everything will be fine!
Diffstat (limited to 'packages/qmake/qmake2-native.inc')
| -rw-r--r-- | packages/qmake/qmake2-native.inc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/packages/qmake/qmake2-native.inc b/packages/qmake/qmake2-native.inc index eb4744ca58..058bf176f9 100644 --- a/packages/qmake/qmake2-native.inc +++ b/packages/qmake/qmake2-native.inc @@ -10,6 +10,7 @@ QTVER = "qtopia-core-opensource-src-${QTVERSION}" FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2-native" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \ file://0001-fix-mkspecs.patch;patch=1 \ + file://qt-config.patch;patch=1 \ file://use-lflags-last.patch;patch=1 \ file://linux-oe-qmake.conf" S = "${WORKDIR}/${QTVER}" @@ -57,10 +58,8 @@ do_compile() { do_stage() { install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake2 install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake-qt4 - install -d ${STAGING_DIR}/${CROSS_SYS}/qt4/ - cp -PfR mkspecs ${STAGING_DIR}/${CROSS_SYS}/qt4/ - install -d ${STAGING_DIR}/${HOST_SYS}/qt4/ - cp -PfR mkspecs ${STAGING_DIR}/${HOST_SYS}/qt4/ + install -d ${CROSS_DATADIR}/qt4 + cp -PfR mkspecs ${CROSS_DATADIR}/qt4/ } do_install() { |