summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-02 23:26:09 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-03 10:02:21 +0100
commite6663ffa5ffe2ac388a1b40c0fd0cddb055b8731 (patch)
tree11e91c8f67f2cb19af4dd9e1914b078a00532c45
parent8609051d8d4f9fa565eb48418a87fa0048613374 (diff)
downloadpoky-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>
-rw-r--r--meta/classes/qt4e.bbclass3
-rw-r--r--meta/classes/qt4x11.bbclass3
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded.inc1
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free.inc1
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 @@
1DEPENDS_prepend = "${@["qt4-embedded ", ""][(d.getVar('PN', True)[:12] == 'qt4-embedded')]}" 1QT4EDEPENDS ?= "qt4-embedded "
2DEPENDS_prepend = "${QT4EDEPENDS}"
2 3
3inherit qmake2 4inherit qmake2
4 5
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 @@
1DEPENDS_prepend = "${@base_contains("PROVIDES", "qt4-x11", "", "qt4-x11 ", d)}" 1QT4DEPENDS ?= "qt4-x11 "
2DEPENDS_prepend = "${QT4DEPENDS}"
2 3
3inherit qmake2 4inherit qmake2
4 5
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"
4DEPENDS += "directfb tslib" 4DEPENDS += "directfb tslib"
5INC_PR = "r49" 5INC_PR = "r49"
6 6
7QT4EDEPENDS = ""
7QT_BASE_LIB ?= "libqt-embedded" 8QT_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"
5SECTION = "x11/libs" 5SECTION = "x11/libs"
6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" 6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
7PROVIDES += "qt4-x11" 7PROVIDES += "qt4-x11"
8QT4DEPENDS = ""
8 9
9INC_PR = "r47" 10INC_PR = "r47"
10 11