diff options
author | Felipe F. Tonello <ftonello@cercacor.com> | 2013-03-13 09:49:12 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-18 13:18:22 +0000 |
commit | 1b87b280d6264a3e0d7254c2d745f4ec2e59bcf9 (patch) | |
tree | 06c43fc1801a44315a7cbd5428061f03710b3fc7 /meta/recipes-qt/qt4 | |
parent | 9c03dd6cae6926e5b6c542bd3ab8936307f69c77 (diff) | |
download | poky-1b87b280d6264a3e0d7254c2d745f4ec2e59bcf9.tar.gz |
qt-mobility: Add bluez dependency if DISTRO_FEATURES has bluetooth
Some modules doesn't requires bluez4 to compile. So it's unnecessary to have
it as dependency.
(From OE-Core rev: ccc76f42590430b2c5d286c72e6a01a21b29a9a3)
Signed-off-by: Felipe F. Tonello <ftonello@cercacor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4')
-rw-r--r-- | meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc index 777863006e..e5e671e7e6 100644 --- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc +++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | |||
@@ -1,5 +1,6 @@ | |||
1 | HOMEPAGE = "http://qt.nokia.com" | 1 | HOMEPAGE = "http://qt.nokia.com" |
2 | DEPENDS += "pulseaudio bluez4" | 2 | DEPENDS += "pulseaudio" |
3 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)}" | ||
3 | 4 | ||
4 | LICENSE = "LGPLv2.1" | 5 | LICENSE = "LGPLv2.1" |
5 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ | 6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ |
@@ -30,6 +31,8 @@ qtm_plugins := "/usr/lib/${qtm_dir}/plugins/QtMobility" | |||
30 | qtm_data := "/usr/share/${qtm_dir}" | 31 | qtm_data := "/usr/share/${qtm_dir}" |
31 | qtm_imports := "/usr/lib/${qtm_dir}/imports" | 32 | qtm_imports := "/usr/lib/${qtm_dir}/imports" |
32 | 33 | ||
34 | qtm_bluezflag ?= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'yes', 'no', d)}" | ||
35 | |||
33 | do_configure_prepend() { | 36 | do_configure_prepend() { |
34 | cp qtmobility.pro qtmobility.pro.old | 37 | cp qtmobility.pro qtmobility.pro.old |
35 | sed -e 's@...QT_INSTALL_DATA.@${qtm_data}@' <qtmobility.pro.old >qtmobility.pro | 38 | sed -e 's@...QT_INSTALL_DATA.@${qtm_data}@' <qtmobility.pro.old >qtmobility.pro |
@@ -49,7 +52,7 @@ do_configure_prepend() { | |||
49 | echo QT_MOBILITY_EXAMPLES = ${qtm_examples} >>./config.pri | 52 | echo QT_MOBILITY_EXAMPLES = ${qtm_examples} >>./config.pri |
50 | echo QT_MOBILITY_DEMOS = ${qtm_demos} >>./config.pri | 53 | echo QT_MOBILITY_DEMOS = ${qtm_demos} >>./config.pri |
51 | echo QT_CONFIG ${qtm_glflags} >>./config.pri | 54 | echo QT_CONFIG ${qtm_glflags} >>./config.pri |
52 | echo bluez_enabled = yes >>./config.pri | 55 | echo bluez_enabled = ${qtm_bluezflag} >>./config.pri |
53 | echo ${qtm_extra_config} >>./config.pri | 56 | echo ${qtm_extra_config} >>./config.pri |
54 | echo CONFIG += ${qtm_embedded} >>./config.pri | 57 | echo CONFIG += ${qtm_embedded} >>./config.pri |
55 | } | 58 | } |