diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-03-25 18:29:54 +0100 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-03-25 18:29:54 +0100 |
| commit | 95e0882e2dfabe457550a885e0eb24893df31742 (patch) | |
| tree | a34220ed25168022c53d9cb5697f3666a427b30c /recipes/qmake/qmake2-native.inc | |
| parent | 451b1c687105655a4f2c9c477b05535041e25060 (diff) | |
| parent | ac41ae95b1dbe54c05adf494c0fa44b3abbfeca3 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/qmake/qmake2-native.inc')
| -rw-r--r-- | recipes/qmake/qmake2-native.inc | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/recipes/qmake/qmake2-native.inc b/recipes/qmake/qmake2-native.inc index 467f130f2e..f84da2ad52 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 = "r7" # 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,7 @@ 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 + install -d ${STAGING_DATADIR_NATIVE}/qt4 + cp -PfR mkspecs ${STAGING_DATADIR_NATIVE}/qt4/ } |