summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-native.inc16
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-native_4.6.3.bb12
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-native_4.7.1.bb13
3 files changed, 31 insertions, 10 deletions
diff --git a/meta/recipes-qt/qt4/qt4-tools-native.inc b/meta/recipes-qt/qt4/qt4-tools-native.inc
index 6dca218..0c4d2c7 100644
--- a/meta/recipes-qt/qt4/qt4-tools-native.inc
+++ b/meta/recipes-qt/qt4/qt4-tools-native.inc
@@ -1,9 +1,16 @@
1DESCRIPTION = "Native tools for Qt/[X11|Mac|Embedded] version 4.x" 1DESCRIPTION = "Native tools for Qt/[X11|Mac|Embedded] version 4.x"
2DEPENDS = "zlib-native dbus-native libsm-native" 2DEPENDS = "zlib-native dbus-native"
3SECTION = "libs" 3SECTION = "libs"
4HOMEPAGE = "http://qt.nokia.com" 4HOMEPAGE = "http://qt.nokia.com"
5PRIORITY = "optional" 5PRIORITY = "optional"
6 6
7LICENSE = "LGPLv2.1 | GPLv3"
8LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
9 file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
10 file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
11
12INC_PR = "r11"
13
7inherit native 14inherit native
8 15
9SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ 16SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
@@ -16,13 +23,14 @@ EXTRA_OECONF = "-prefix ${prefix} \
16 -L ${STAGING_LIBDIR_NATIVE} \ 23 -L ${STAGING_LIBDIR_NATIVE} \
17 -I ${STAGING_INCDIR_NATIVE} \ 24 -I ${STAGING_INCDIR_NATIVE} \
18 -qt-libjpeg -qt-gif -system-zlib \ 25 -qt-libjpeg -qt-gif -system-zlib \
19 -no-libjpeg -no-libpng \ 26 -no-libjpeg -no-libpng -no-libmng -no-libtiff \
20 -no-accessibility \ 27 -no-accessibility \
21 -no-cups \ 28 -no-cups \
22 -no-exceptions \ 29 -no-exceptions \
23 -no-nas-sound \ 30 -no-nas-sound \
24 -no-nis \ 31 -no-nis -no-openssl \
25 -verbose -release -static \ 32 -verbose -release -static \
33 -embedded -no-freetype -no-glib -no-iconv \
26 -qt3support" 34 -qt3support"
27 35
28# yank default -e, otherwise we get the following error: 36# yank default -e, otherwise we get the following error:
@@ -59,7 +67,7 @@ do_install() {
59 for i in moc uic rcc lrelease lupdate; do 67 for i in moc uic rcc lrelease lupdate; do
60 install -m 0755 bin/${i} ${D}${bindir}/${i}4 68 install -m 0755 bin/${i} ${D}${bindir}/${i}4
61 done 69 done
62 70
63 install -d ${D}${datadir}/qt4/ 71 install -d ${D}${datadir}/qt4/
64 cp -PfR mkspecs ${D}${datadir}/qt4/ 72 cp -PfR mkspecs ${D}${datadir}/qt4/
65 ln -sf linux-g++ ${D}${datadir}/qt4/mkspecs/${BUILD_OS}-oe-g++ 73 ln -sf linux-g++ ${D}${datadir}/qt4/mkspecs/${BUILD_OS}-oe-g++
diff --git a/meta/recipes-qt/qt4/qt4-tools-native_4.6.3.bb b/meta/recipes-qt/qt4/qt4-tools-native_4.6.3.bb
index ac66eb3..dae8cd1 100644
--- a/meta/recipes-qt/qt4/qt4-tools-native_4.6.3.bb
+++ b/meta/recipes-qt/qt4/qt4-tools-native_4.6.3.bb
@@ -1,11 +1,11 @@
1require qt4-tools-native.inc 1require qt4-tools-native.inc
2 2
3LICENSE = "LGPLv2.1 | GPLv3" 3PR = "${INC_PR}.0"
4LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
5 file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
6 file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
7PR = "r2"
8 4
9EXTRA_OECONF += " -no-fast -silent -no-rpath -no-freetype -no-fontconfig" 5EXTRA_OECONF += " -no-fast -silent -no-rpath"
10 6
11TOBUILD := "src/tools/bootstrap ${TOBUILD}" 7TOBUILD := "src/tools/bootstrap ${TOBUILD}"
8
9SRC_URI[md5sum] = "5c69f16d452b0bb3d44bc3c10556c072"
10SRC_URI[sha256sum] = "f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768"
11
diff --git a/meta/recipes-qt/qt4/qt4-tools-native_4.7.1.bb b/meta/recipes-qt/qt4/qt4-tools-native_4.7.1.bb
new file mode 100644
index 0000000..e9de510
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-tools-native_4.7.1.bb
@@ -0,0 +1,13 @@
1require qt4-tools-native.inc
2
3PR = "${INC_PR}.0"
4
5# Find the g++.conf/linux.conf in the right directory.
6FILESPATHPKG =. "qt-${PV}:"
7
8EXTRA_OECONF += " -no-fast -silent -no-rpath"
9
10TOBUILD := "src/tools/bootstrap ${TOBUILD}"
11
12SRC_URI[md5sum] = "6f88d96507c84e9fea5bf3a71ebeb6d7"
13SRC_URI[sha256sum] = "8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a"