diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-08-02 16:57:39 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-08-02 16:57:39 +0000 |
| commit | ce9aade2160f6c3f0a19e1c370626a44ca62fec2 (patch) | |
| tree | 86e3b17f35f664ce2427eada9ff2483979154be3 /packages/qmake/qmake2-native.inc | |
| parent | 73a904e7583df04f08458005afe462b60f8c006e (diff) | |
qmake2 native: update to 4.4.1 and fix builds from scratch
Diffstat (limited to 'packages/qmake/qmake2-native.inc')
| -rw-r--r-- | packages/qmake/qmake2-native.inc | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/packages/qmake/qmake2-native.inc b/packages/qmake/qmake2-native.inc index f7bdd7836b..642adf874a 100644 --- a/packages/qmake/qmake2-native.inc +++ b/packages/qmake/qmake2-native.inc @@ -3,13 +3,15 @@ PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" SECTION = "devel" LICENSE = "GPL" -PR = "r2" +PR = "r3" -QTVER = "qtopia-core-opensource-src-${QTVERSION}" +# We call 'moc' during the build +DEPENDS = "uicmoc4-native" -SRC_URI = "ftp://ftp.trolltech.com/qt/source/${QTVER}.tar.gz \ +QTVER = "qt-embedded-linux-opensource-src-${QTVERSION}" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/${QTVER}.tar.bz2 \ file://0001-fix-mkspecs.patch;patch=1 \ - file://0008-backport-qt-lib-infix.patch;patch=1 \ file://qt-config.patch;patch=1 \ file://use-lflags-last.patch;patch=1 \ file://linux-oe-qmake.conf" @@ -23,6 +25,8 @@ export QTDIR = "${S}" EXTRA_OEMAKE = "-e" do_configure() { + # Make sure we regenerate all Makefiles + find ${S} -name "Makefile" | xargs rm # Install the OE build templates for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ do @@ -43,8 +47,9 @@ do_configure() { export OE_QMAKE_LINK="${CCLD}" export OE_QMAKE_AR="${AR}" export OE_QMAKE_STRIP="${STRIP}" - export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic" - export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc" + export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic4" + export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc4" + export QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc4" export OE_QMAKE_RCC="non-existant" export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake" export OE_QMAKE_RPATH="-Wl,-rpath-link," |