[oe-commits] : qmake2: fix path issues
OE GIT Trial
gittrial at amethyst.openembedded.net
Thu Oct 2 11:58:35 UTC 2008
Module: OE.dev
Branch: org.openembedded.dev
Commit: 5856b0434b325b42db0c941785366deb47aa14c4
URL: http://gitweb.openembedded.net//OE.dev.git/?a=commit;h=5856b0434b325b42db0c941785366deb47aa14c4
Author: <koen at openembedded.org>
Date: Thu Oct 2 11:27:36 2008 +0000
qmake2: fix path issues
---
packages/qmake/qmake2-native.inc | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/packages/qmake/qmake2-native.inc b/packages/qmake/qmake2-native.inc
index 642adf8..b2ffce4 100644
--- a/packages/qmake/qmake2-native.inc
+++ b/packages/qmake/qmake2-native.inc
@@ -18,7 +18,8 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/${QTVER}.tar.bz2 \
S = "${WORKDIR}/${QTVER}"
# we need the real target system here
-CROSS_SYS := "${TARGET_SYS}"
+CROSS_SYS := "${MULTIMACH_TARGET_SYS}"
+
inherit autotools
export QTDIR = "${S}"
@@ -53,7 +54,7 @@ do_configure() {
export OE_QMAKE_RCC="non-existant"
export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake"
export OE_QMAKE_RPATH="-Wl,-rpath-link,"
- echo yes | ./configure -prefix ${STAGING_DIR}/${CROSS_SYS}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed"
+ echo yes | ./configure -prefix ${STAGING_DIR_TARGET}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed"
}
do_compile() {
@@ -61,8 +62,10 @@ do_compile() {
}
do_stage() {
- install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake2
- install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake-qt4
+ install -d ${STAGING_BINDIR_NATIVE}
+ install -m 0755 bin/qmake ${STAGING_BINDIR_NATIVE}/qmake2
+ install -m 0755 bin/qmake ${STAGING_BINDIR_NATIVE}/qmake-qt4
+
install -d ${CROSS_DATADIR}/qt4
cp -PfR mkspecs ${CROSS_DATADIR}/qt4/
}
More information about the Openembedded-commits
mailing list