diff options
| author |   Gerald Britton <gbritton@doomcom.org> | 2004-05-08 23:04:54 +0000 |
|---|---|---|
| committer | Gerald Britton <gbritton@doomcom.org> | 2004-05-08 23:04:54 +0000 |
| commit | 210ab474c06ebf759982513a125b7fc031bde663 (patch) | |
| tree | 55457aec05b86a1109f7433efeafa85ec649385d /qmake | |
| parent | 7599f787f1619884dc352444ab219fda0f361dfe (diff) | |
| download | openembedded-210ab474c06ebf759982513a125b7fc031bde663.tar.gz | |
templated qmake support (to allow uclibc builds), also update mtd
BKrev: 409d6796_U-R5ieZHQVcqDkv7KMpBw
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/qmake-native-3.2.3/linux-oe-qmake.conf (renamed from qmake/qmake-native-3.2.3/linux-oe-g++/qmake.conf) | 0 | ||||
| -rw-r--r-- | qmake/qmake-native-3.2.3/linux-oe-qplatformdefs.h (renamed from qmake/qmake-native-3.2.3/linux-oe-g++/qplatformdefs.h) | 0 | ||||
| -rw-r--r-- | qmake/qmake-native_3.2.3.oe | 41 |
3 files changed, 30 insertions, 11 deletions
diff --git a/qmake/qmake-native-3.2.3/linux-oe-g++/qmake.conf b/qmake/qmake-native-3.2.3/linux-oe-qmake.conf index e69de29bb2..e69de29bb2 100644 --- a/qmake/qmake-native-3.2.3/linux-oe-g++/qmake.conf +++ b/qmake/qmake-native-3.2.3/linux-oe-qmake.conf diff --git a/qmake/qmake-native-3.2.3/linux-oe-g++/qplatformdefs.h b/qmake/qmake-native-3.2.3/linux-oe-qplatformdefs.h index e69de29bb2..e69de29bb2 100644 --- a/qmake/qmake-native-3.2.3/linux-oe-g++/qplatformdefs.h +++ b/qmake/qmake-native-3.2.3/linux-oe-qplatformdefs.h diff --git a/qmake/qmake-native_3.2.3.oe b/qmake/qmake-native_3.2.3.oe index 692537cc81..381c09ba97 100644 --- a/qmake/qmake-native_3.2.3.oe +++ b/qmake/qmake-native_3.2.3.oe @@ -3,36 +3,55 @@ PRIORITY = "optional" DEPENDS = "virtual/libc" LICENSE = "GPL/QPL" -SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-free-${PV}.tar.bz2" +SRC_URI = \ + "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-free-${PV}.tar.bz2 \ + file://${FILESDIR}/linux-oe-qmake.conf \ + file://${FILESDIR}/linux-oe-qplatformdefs.h" + S = "${WORKDIR}/qt-embedded-free-${PV}" inherit autotools native export QTDIR = "${S}" -ARCH_i686 = "x86" - -EXTRA_OECONF = "-static -no-gif -no-sm -system-zlib -system-libjpeg -system-libpng -no-thread -no-nis -no-cups -no-stl \ - -disable-styles -disable-tools -disable-kernel -disable-widgets -disable-dialogs -disable-iconview \ - -disable-workspace -disable-network -disable-canvas -disable-table -disable-xml -disable-opengl -disable-sql" +EXTRA_OECONF = "-static -no-gif -no-sm -system-zlib -system-libjpeg \ + -system-libpng -no-thread -no-nis -no-cups -no-stl -disable-styles \ + -disable-tools -disable-kernel -disable-widgets -disable-dialogs \ + -disable-iconview -disable-workspace -disable-network -disable-canvas \ + -disable-table -disable-xml -disable-opengl -disable-sql" EXTRA_OEMAKE = "-e" do_configure() { - oenote ./configure ${EXTRA_OECONF} - echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed" + # Install the OE build templates (linux, linux-uclibc) + install -d ${S}/mkspecs/qws/linux-oe-g++ + install -d ${S}/mkspecs/qws/linux-uclibc-oe-g++ + install -m 0644 ${WORKDIR}/linux-oe-qmake.conf \ + ${S}/mkspecs/qws/linux-oe-g++/qmake.conf + ln -s ../../linux-g++/qplatformdefs.h \ + ${S}/mkspecs/qws/linux-oe-g++/qplatformdefs.h + ln -s ../linux-oe-g++/qmake.conf \ + ${S}/mkspecs/qws/linux-uclibc-oe-g++/qmake.conf + ln -s ../../linux-g++/qplatformdefs.h \ + ${S}/mkspecs/qws/linux-uclibc-oe-g++/qplatformdefs.h + + QMAKESPEC= + PLATFORM=${HOST_OS}-oe-g++ + export PLATFORM + oenote ./configure ${EXTRA_OECONF} + echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed" } do_compile() { - sleep 1 + : } do_stage() { - install -m 0755 bin/qmake ${STAGING_BINDIR} + install -m 0755 bin/qmake ${STAGING_BINDIR} install -d ${QMAKE_MKSPEC_PATH} cp -dfR mkspecs/* ${QMAKE_MKSPEC_PATH} } do_install() { - sleep 1 + : } |