diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-02 23:26:09 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-03 10:02:21 +0100 |
commit | e6663ffa5ffe2ac388a1b40c0fd0cddb055b8731 (patch) | |
tree | 11e91c8f67f2cb19af4dd9e1914b078a00532c45 /meta/recipes-qt | |
parent | 8609051d8d4f9fa565eb48418a87fa0048613374 (diff) | |
download | poky-e6663ffa5ffe2ac388a1b40c0fd0cddb055b8731.tar.gz |
qt4: Avoid circular dependencies with multilib
Without this, circular dependencies are found when attempting to build
multilib versions of qt4 (or bitbake world in a multilib enabled build).
(From OE-Core rev: b2e8cc5ae227656211fb7f32260e7dc4e2fb556e)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-embedded.inc | 1 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4-x11-free.inc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc index c060634233..905e2779bb 100644 --- a/meta/recipes-qt/qt4/qt4-embedded.inc +++ b/meta/recipes-qt/qt4/qt4-embedded.inc | |||
@@ -4,6 +4,7 @@ HOMEPAGE = "http://qt.nokia.com" | |||
4 | DEPENDS += "directfb tslib" | 4 | DEPENDS += "directfb tslib" |
5 | INC_PR = "r49" | 5 | INC_PR = "r49" |
6 | 6 | ||
7 | QT4EDEPENDS = "" | ||
7 | QT_BASE_LIB ?= "libqt-embedded" | 8 | QT_BASE_LIB ?= "libqt-embedded" |
8 | 9 | ||
9 | # Set necessary variables in the profile | 10 | # Set necessary variables in the profile |
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc index 68b30789bf..404d8b8563 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free.inc +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc | |||
@@ -5,6 +5,7 @@ HOMEPAGE = "http://qt.nokia.com" | |||
5 | SECTION = "x11/libs" | 5 | SECTION = "x11/libs" |
6 | DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" | 6 | DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" |
7 | PROVIDES += "qt4-x11" | 7 | PROVIDES += "qt4-x11" |
8 | QT4DEPENDS = "" | ||
8 | 9 | ||
9 | INC_PR = "r47" | 10 | INC_PR = "r47" |
10 | 11 | ||