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:01:31 +0100 |
| commit | b2e8cc5ae227656211fb7f32260e7dc4e2fb556e (patch) | |
| tree | 60b4438bafd3659387a3cb6ac859cdf36e415dae | |
| parent | c03f76160e3cc3cb4fbf3cee114665c34bff06e6 (diff) | |
| download | openembedded-core-contrib-b2e8cc5ae227656211fb7f32260e7dc4e2fb556e.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).
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/qt4e.bbclass | 3 | ||||
| -rw-r--r-- | meta/classes/qt4x11.bbclass | 3 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-embedded.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-x11-free.inc | 1 |
4 files changed, 6 insertions, 2 deletions
diff --git a/meta/classes/qt4e.bbclass b/meta/classes/qt4e.bbclass index 05c24efaa1..de2a68d25b 100644 --- a/meta/classes/qt4e.bbclass +++ b/meta/classes/qt4e.bbclass @@ -1,4 +1,5 @@ -DEPENDS_prepend = "${@["qt4-embedded ", ""][(d.getVar('PN', True)[:12] == 'qt4-embedded')]}" +QT4EDEPENDS ?= "qt4-embedded " +DEPENDS_prepend = "${QT4EDEPENDS}" inherit qmake2 diff --git a/meta/classes/qt4x11.bbclass b/meta/classes/qt4x11.bbclass index 52190f45c1..b06e15d29e 100644 --- a/meta/classes/qt4x11.bbclass +++ b/meta/classes/qt4x11.bbclass @@ -1,4 +1,5 @@ -DEPENDS_prepend = "${@base_contains("PROVIDES", "qt4-x11", "", "qt4-x11 ", d)}" +QT4DEPENDS ?= "qt4-x11 " +DEPENDS_prepend = "${QT4DEPENDS}" inherit qmake2 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" DEPENDS += "directfb tslib" INC_PR = "r49" +QT4EDEPENDS = "" QT_BASE_LIB ?= "libqt-embedded" # 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" SECTION = "x11/libs" DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" PROVIDES += "qt4-x11" +QT4DEPENDS = "" INC_PR = "r47" |