summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-08-20 09:10:16 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-24 23:47:04 +0100
commite062f01d5fbf30ede9f47e999127d0bcc5636ce0 (patch)
treece47414efcefe89a01b9718c85a4f6189b8553e3
parent0f425669b716e7aaa7e5ebc675e7987df3accee6 (diff)
downloadpoky-e062f01d5fbf30ede9f47e999127d0bcc5636ce0.tar.gz
packagegroup-qt*-toolchain-target: fix hard dependency on phonon library
Having disabled phonon by default in Qt4 we need to ensure this packagegroup is still buildable when it's not available. (From OE-Core rev: 9f1ce43fa1bdd3952ccf510cb648ebe9e0e8aac2) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.inc b/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.inc
index 02a032658d..e09782dab4 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.inc
+++ b/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.inc
@@ -11,7 +11,6 @@ RDEPENDS_${PN} += " \
11 packagegroup-core-standalone-sdk-target \ 11 packagegroup-core-standalone-sdk-target \
12 qt4${QTLIBPREFIX}-mkspecs \ 12 qt4${QTLIBPREFIX}-mkspecs \
13 libqt${QTLIBPREFIX}multimedia4-dev \ 13 libqt${QTLIBPREFIX}multimedia4-dev \
14 libqt${QTLIBPREFIX}phonon4-dev \
15 libqt${QTLIBPREFIX}3support4-dev \ 14 libqt${QTLIBPREFIX}3support4-dev \
16 libqt${QTLIBPREFIX}clucene4-dev \ 15 libqt${QTLIBPREFIX}clucene4-dev \
17 libqt${QTLIBPREFIX}core4-dev \ 16 libqt${QTLIBPREFIX}core4-dev \
@@ -34,3 +33,7 @@ RDEPENDS_${PN} += " \
34 libsqlite3-dev \ 33 libsqlite3-dev \
35 expat-dev \ 34 expat-dev \
36 " 35 "
36
37RRECOMMENDS_${PN} += " \
38 libqt${QTLIBPREFIX}phonon4-dev \
39 "