diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2012-09-07 17:07:11 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-12 15:13:36 +0100 |
commit | 7cd145472d1453cc27a600e3ffc3c8855b9bc17d (patch) | |
tree | 177b66eb1542052249bf2edcd98cadfc46bd8d70 /meta/recipes-qt | |
parent | 9c2bb6822cd23759fbaf4ef5f05f27cf766f3bfb (diff) | |
download | poky-7cd145472d1453cc27a600e3ffc3c8855b9bc17d.tar.gz |
qt4: Update qt4.inc to remove staticdev deps in -dbg packages
It appears that the qt4.inc had a copy/paste error relating to creating
a list of staticdev packages, that caused them to show up as dependencies
in the -dbg package.
(From OE-Core rev: a7c5cec5fc63b4a26d84673460426b35669068dc)
Signed-off-by: Mark Hatle <mark.hatle@windriver.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')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-embedded.inc | 2 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4-x11-free.inc | 2 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4.inc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc index de1b88ee83..53eb652b08 100644 --- a/meta/recipes-qt/qt4/qt4-embedded.inc +++ b/meta/recipes-qt/qt4/qt4-embedded.inc | |||
@@ -2,7 +2,7 @@ DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is | |||
2 | SECTION = "libs" | 2 | SECTION = "libs" |
3 | HOMEPAGE = "http://qt.nokia.com" | 3 | HOMEPAGE = "http://qt.nokia.com" |
4 | DEPENDS += "directfb tslib" | 4 | DEPENDS += "directfb tslib" |
5 | INC_PR = "r47" | 5 | INC_PR = "r48" |
6 | 6 | ||
7 | QT_BASE_LIB ?= "libqt-embedded" | 7 | QT_BASE_LIB ?= "libqt-embedded" |
8 | 8 | ||
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc index e229b85327..0ae74f7f3d 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free.inc +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc | |||
@@ -6,7 +6,7 @@ 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 | 8 | ||
9 | INC_PR = "r45" | 9 | INC_PR = "r46" |
10 | 10 | ||
11 | QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " | 11 | QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " |
12 | QT_GLFLAGS_qemux86 = "-opengl" | 12 | QT_GLFLAGS_qemux86 = "-opengl" |
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index b8c6baf3a2..ba231baa5d 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc | |||
@@ -61,7 +61,7 @@ python __anonymous () { | |||
61 | staticdev_packages.append("%s-staticdev" % pkg) | 61 | staticdev_packages.append("%s-staticdev" % pkg) |
62 | for name in d.getVar("OTHER_PACKAGES", True).split(): | 62 | for name in d.getVar("OTHER_PACKAGES", True).split(): |
63 | dbg_packages.append("%s-dbg" % name) | 63 | dbg_packages.append("%s-dbg" % name) |
64 | dbg_packages.append("%s-staticdev" % name) | 64 | staticdev_packages.append("%s-staticdev" % name) |
65 | 65 | ||
66 | for name in d.getVar("QT_EXTRA_LIBS", True).split(): | 66 | for name in d.getVar("QT_EXTRA_LIBS", True).split(): |
67 | pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt", "").replace("_", "-") + "4" | 67 | pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt", "").replace("_", "-") + "4" |