diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-06-18 13:47:03 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-06-19 19:25:42 +0200 |
| commit | 1583b2362494cc5b876700f1ddd5a4ab1a0f161e (patch) | |
| tree | 7a4f13b11dc4c997b91c36a4678af0560c84ecba | |
| parent | 608afbe8283c111964bef1246854edfd89ccee75 (diff) | |
| download | meta-openembedded-1583b2362494cc5b876700f1ddd5a4ab1a0f161e.tar.gz | |
qt4: remove qt4-tools-sdk
qt4-tools-sdk has been replaced by qt4-tools-nativesdk in oe-core.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
| -rw-r--r-- | meta-oe/recipes-qt/qt4/qt4-tools-sdk.inc | 88 | ||||
| -rw-r--r-- | meta-oe/recipes-qt/qt4/qt4-tools-sdk_4.7.2.bb | 8 |
2 files changed, 0 insertions, 96 deletions
diff --git a/meta-oe/recipes-qt/qt4/qt4-tools-sdk.inc b/meta-oe/recipes-qt/qt4/qt4-tools-sdk.inc deleted file mode 100644 index 1bcfed060f..0000000000 --- a/meta-oe/recipes-qt/qt4/qt4-tools-sdk.inc +++ /dev/null | |||
| @@ -1,88 +0,0 @@ | |||
| 1 | DESCRIPTION = "SDK tools for Qt/[X11|Mac|Embedded] version 4.x" | ||
| 2 | DEPENDS = "zlib-native dbus-native" | ||
| 3 | SECTION = "libs" | ||
| 4 | HOMEPAGE = "http://www.trolltech.com" | ||
| 5 | PRIORITY = "optional" | ||
| 6 | LICENSE = "LGPLv2.1 GPLv3" | ||
| 7 | |||
| 8 | INC_PR = "r2" | ||
| 9 | |||
| 10 | FILESPATHPKG =. "qt-${PV}:" | ||
| 11 | inherit nativesdk | ||
| 12 | |||
| 13 | SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ | ||
| 14 | file://configure-lflags.patch \ | ||
| 15 | file://compile.test-lflags.patch \ | ||
| 16 | file://qt-config.patch \ | ||
| 17 | file://g++.conf \ | ||
| 18 | file://linux.conf" | ||
| 19 | |||
| 20 | S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" | ||
| 21 | |||
| 22 | |||
| 23 | # FIXME: make it work with "${STAGING_BINDIR_NATIVE}/pkg-config --cflags dbus-1" | ||
| 24 | EXTRA_OECONF = "-prefix ${prefix} \ | ||
| 25 | -qt-libjpeg -qt-gif -system-zlib \ | ||
| 26 | -no-libjpeg -no-libpng -no-libmng -no-libtiff \ | ||
| 27 | -no-accessibility \ | ||
| 28 | -no-cups \ | ||
| 29 | -no-exceptions \ | ||
| 30 | -no-nas-sound \ | ||
| 31 | -no-nis -no-openssl \ | ||
| 32 | -verbose -release -fast -static \ | ||
| 33 | -embedded -no-freetype -no-glib -no-iconv \ | ||
| 34 | -qt3support \ | ||
| 35 | -I${STAGING_DIR_NATIVE}/usr/include \ | ||
| 36 | -I${STAGING_DIR_NATIVE}/usr/include/dbus-1.0 \ | ||
| 37 | -I${STAGING_DIR_NATIVE}/usr/lib/dbus-1.0/include" | ||
| 38 | |||
| 39 | # yank default -e, otherwise we get the following error: | ||
| 40 | # moc_qbuffer.cpp: No such file or directory | ||
| 41 | EXTRA_OEMAKE = " " | ||
| 42 | |||
| 43 | do_configure() { | ||
| 44 | (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" | ||
| 45 | } | ||
| 46 | |||
| 47 | TOBUILD = "\ | ||
| 48 | src/tools/bootstrap \ | ||
| 49 | src/tools/moc \ | ||
| 50 | src/corelib \ | ||
| 51 | src/sql \ | ||
| 52 | src/dbus \ | ||
| 53 | src/qt3support \ | ||
| 54 | src/xml \ | ||
| 55 | src/tools/uic \ | ||
| 56 | src/tools/rcc \ | ||
| 57 | src/network \ | ||
| 58 | src/gui \ | ||
| 59 | src/tools/uic3 \ | ||
| 60 | tools/linguist/lrelease \ | ||
| 61 | tools/linguist/lupdate \ | ||
| 62 | tools/qdbus \ | ||
| 63 | " | ||
| 64 | |||
| 65 | do_compile() { | ||
| 66 | for i in ${TOBUILD}; do | ||
| 67 | cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}" | ||
| 68 | done | ||
| 69 | } | ||
| 70 | |||
| 71 | do_install() { | ||
| 72 | install -d ${D}${bindir} | ||
| 73 | install -m 0755 bin/qmake ${D}${bindir}/qmake2 | ||
| 74 | for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do | ||
| 75 | install -m 0755 bin/${i} ${D}${bindir}/${i}4 | ||
| 76 | done | ||
| 77 | |||
| 78 | (cd ${D}${bindir}; \ | ||
| 79 | ln -s qmake2 qmake; \ | ||
| 80 | for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do \ | ||
| 81 | ln -s ${i}4 ${i}; \ | ||
| 82 | done) | ||
| 83 | |||
| 84 | # make a symbolic link to mkspecs for compatibility with Nokia's SDK | ||
| 85 | # and QTCreator | ||
| 86 | (cd ${D}${bindir}/..; ln -s ${TARGET_SYS}/usr/share/qtopia/mkspecs mkspecs;) | ||
| 87 | } | ||
| 88 | |||
diff --git a/meta-oe/recipes-qt/qt4/qt4-tools-sdk_4.7.2.bb b/meta-oe/recipes-qt/qt4/qt4-tools-sdk_4.7.2.bb deleted file mode 100644 index c86ac2a1ac..0000000000 --- a/meta-oe/recipes-qt/qt4/qt4-tools-sdk_4.7.2.bb +++ /dev/null | |||
| @@ -1,8 +0,0 @@ | |||
| 1 | require qt4-tools-sdk.inc | ||
| 2 | |||
| 3 | PR = "${INC_PR}.0" | ||
| 4 | |||
| 5 | DEFAULT_PREFERENCE = "-1" | ||
| 6 | |||
| 7 | SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb" | ||
| 8 | SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336" | ||
