summaryrefslogtreecommitdiff
path: root/recipes/qmake
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2009-03-24 20:39:40 +0100
committerJeremy Lainé <jeremy.laine@m4x.org>2009-03-24 20:39:40 +0100
commit8925342a450c98166ec9f9d338f939eb1dbef96d (patch)
treec1a9293a0818666a3bf9e68a5160a2c25dde8f4e /recipes/qmake
parent200e1df234c84b777402d7948dd7d87bf88b1ca6 (diff)
qmake2-native: don't touch the target's directories
Diffstat (limited to 'recipes/qmake')
-rw-r--r--recipes/qmake/qmake2-native.inc13
1 files changed, 3 insertions, 10 deletions
diff --git a/recipes/qmake/qmake2-native.inc b/recipes/qmake/qmake2-native.inc
index 467f130f2e..ffca31cc9e 100644
--- a/recipes/qmake/qmake2-native.inc
+++ b/recipes/qmake/qmake2-native.inc
@@ -3,7 +3,7 @@ PRIORITY = "optional"
HOMEPAGE = "http://www.trolltech.com"
SECTION = "devel"
LICENSE = "GPL"
-PR = "r5"
+PR = "r6"
# We call 'moc' during the build
DEPENDS = "uicmoc4-native"
@@ -17,9 +17,6 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/${QTVER}.tar.bz2 \
file://linux-oe-qmake.conf"
S = "${WORKDIR}/${QTVER}"
-# we need the real target system here
-CROSS_SYS := "${MULTIMACH_TARGET_SYS}"
-
inherit autotools
export QTDIR = "${S}"
@@ -39,7 +36,6 @@ do_configure() {
QMAKESPEC=
PLATFORM=${HOST_OS}-oe-g++
export PLATFORM
- # yes, TARGET_SYS is correct, because this is a 'cross'-qmake-native :) :M:
export OE_QMAKE_CC="${CC}"
export OE_QMAKE_CFLAGS="${CFLAGS}"
export OE_QMAKE_CXX="${CXX}"
@@ -55,7 +51,7 @@ do_configure() {
export QMAKE_RCC="${STAGING_BINDIR_NATIVE}/rcc4"
export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake"
export OE_QMAKE_RPATH="-Wl,-rpath-link,"
- echo yes | ./configure -prefix ${STAGING_DIR_TARGET}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed"
+ echo yes | ./configure -prefix ${STAGING_DIR_NATIVE}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed"
}
do_compile() {
@@ -65,8 +61,5 @@ do_compile() {
do_stage() {
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/
+ install -m 0755 bin/qmake ${STAGING_BINDIR_NATIVE}/qmake-qt4
}