summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-08-10 11:38:55 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-15 14:26:18 (GMT)
commit8cb51a508cf99fe6b6a93a26cf7eb107875b0dbc (patch)
tree3d7a7f2aea8b8bfba94aa204d2f1d7b7e962cd6c /meta/recipes-qt
parentfb2dfe7ac8e70d2969ebe14995900217e54716f6 (diff)
downloadpoky-8cb51a508cf99fe6b6a93a26cf7eb107875b0dbc.tar.gz
qt4: replace qt4-tools-native with qt4-native
Installs native versions of the Qt libraries in addition to the tools, allowing compilation of external native tools that require Qt libs. PROVIDES qt4-tools-native so it should be a drop-in replacement. Developed with reference to the corresponding qt4-native changes in OE. (From OE-Core rev: a6fd9b8104e8d3cbfce0376811aeeef746ad6889) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/qt4-native.inc (renamed from meta/recipes-qt/qt4/qt4-tools-native.inc)20
-rw-r--r--meta/recipes-qt/qt4/qt4-native_4.7.3.bb (renamed from meta/recipes-qt/qt4/qt4-tools-native_4.7.3.bb)2
2 files changed, 15 insertions, 7 deletions
diff --git a/meta/recipes-qt/qt4/qt4-tools-native.inc b/meta/recipes-qt/qt4/qt4-native.inc
index c4a58ed..3baea20 100644
--- a/meta/recipes-qt/qt4/qt4-tools-native.inc
+++ b/meta/recipes-qt/qt4/qt4-native.inc
@@ -1,7 +1,8 @@
1DESCRIPTION = "Native tools for Qt/[X11|Mac|Embedded] version 4.x" 1DESCRIPTION = "Native version of Qt/[X11|Mac|Embedded]"
2DEPENDS = "zlib-native dbus-native" 2DEPENDS = "zlib-native dbus-native"
3SECTION = "libs" 3SECTION = "libs"
4HOMEPAGE = "http://qt.nokia.com" 4HOMEPAGE = "http://qt.nokia.com"
5PROVIDES = "qt4-tools-native"
5 6
6LICENSE = "LGPLv2.1 | GPLv3" 7LICENSE = "LGPLv2.1 | GPLv3"
7LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ 8LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
@@ -25,11 +26,11 @@ EXTRA_OECONF = "-prefix ${prefix} \
25 -no-libjpeg -no-libpng -no-libmng -no-libtiff \ 26 -no-libjpeg -no-libpng -no-libmng -no-libtiff \
26 -no-accessibility \ 27 -no-accessibility \
27 -no-cups \ 28 -no-cups \
28 -no-exceptions \
29 -no-nas-sound \ 29 -no-nas-sound \
30 -no-nis -no-openssl \ 30 -no-nis -no-openssl \
31 -verbose -release -static \ 31 -verbose -release \
32 -embedded -no-freetype -no-glib -no-iconv \ 32 -embedded -no-freetype -no-glib -no-iconv \
33 -exceptions -xmlpatterns \
33 -qt3support" 34 -qt3support"
34 35
35# yank default -e, otherwise we get the following error: 36# yank default -e, otherwise we get the following error:
@@ -44,12 +45,15 @@ TOBUILD = "\
44 src/tools/moc \ 45 src/tools/moc \
45 src/corelib \ 46 src/corelib \
46 src/sql \ 47 src/sql \
47 src/dbus \
48 src/qt3support \
49 src/xml \ 48 src/xml \
49 src/network \
50 src/tools/uic \ 50 src/tools/uic \
51 src/tools/rcc \ 51 src/tools/rcc \
52 src/network \ 52 src/xmlpatterns \
53 src/dbus \
54 src/gui \
55 src/testlib \
56 src/qt3support \
53 tools/linguist/lrelease \ 57 tools/linguist/lrelease \
54 tools/linguist/lupdate \ 58 tools/linguist/lupdate \
55" 59"
@@ -73,4 +77,8 @@ do_install() {
73 cp -f ${WORKDIR}/g++.conf ${WORKDIR}/linux.conf ${D}${datadir}/qt4/mkspecs/common/ 77 cp -f ${WORKDIR}/g++.conf ${WORKDIR}/linux.conf ${D}${datadir}/qt4/mkspecs/common/
74 78
75 install -m 0644 tools/porting/src/q3porting.xml ${D}${datadir}/qt4/ 79 install -m 0644 tools/porting/src/q3porting.xml ${D}${datadir}/qt4/
80
81 for i in ${TOBUILD}; do
82 cd ${S}/$i && oe_runmake install INSTALL_ROOT=${D}
83 done
76} 84}
diff --git a/meta/recipes-qt/qt4/qt4-tools-native_4.7.3.bb b/meta/recipes-qt/qt4/qt4-native_4.7.3.bb
index 8d292af..5c84d4d 100644
--- a/meta/recipes-qt/qt4/qt4-tools-native_4.7.3.bb
+++ b/meta/recipes-qt/qt4/qt4-native_4.7.3.bb
@@ -1,4 +1,4 @@
1require qt4-tools-native.inc 1require qt4-native.inc
2 2
3PR = "${INC_PR}.1" 3PR = "${INC_PR}.1"
4 4