diff options
| author | Yu Ke <ke.yu@intel.com> | 2011-08-15 18:37:29 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-15 15:26:21 +0100 |
| commit | c3a66d99193f7e12b4f9944a34974c824c6ba78d (patch) | |
| tree | 943dbd9bc0f4d7d82fc37d1a2535e2236c0d33a0 /meta/recipes-qt | |
| parent | 92b2e942e1e98492c73a7b888f00975c2423673a (diff) | |
| download | poky-c3a66d99193f7e12b4f9944a34974c824c6ba78d.tar.gz | |
qt4.inc: revise RRECOMMENDS
using ${QT_BASE_NAME}-dbg as RRECOMMENDS is not correct in qt4-x11-free
case, because ${QT_BASE_NAME}-dbg i.e. qt4-dbg does not exist
this patch fix it by using ${PN}
(From OE-Core rev: d72adf3c4cf3de09d2a0bc6d1b9e7c9fd127bd60)
Signed-off-by: Yu Ke <ke.yu@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.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index ba6fad5c2b..a68a2e4a5f 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc | |||
| @@ -51,7 +51,7 @@ python __anonymous () { | |||
| 51 | ${includedir}/${QT_DIR_NAME}/%(incname)s | 51 | ${includedir}/${QT_DIR_NAME}/%(incname)s |
| 52 | ${libdir}/pkgconfig/%(name)s${QT_LIBINFIX}.pc""" % locals(), d) | 52 | ${libdir}/pkgconfig/%(name)s${QT_LIBINFIX}.pc""" % locals(), d) |
| 53 | bb.data.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s${QT_LIBINFIX}.so.*" % locals(), d) | 53 | bb.data.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s${QT_LIBINFIX}.so.*" % locals(), d) |
| 54 | bb.data.setVar("RRECOMMENDS_%s-dbg" % pkg, "${QT_BASE_NAME}-dbg", d) | 54 | bb.data.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg", d) |
| 55 | lib_packages.append(pkg) | 55 | lib_packages.append(pkg) |
| 56 | dev_packages.append("%s-dev" % pkg) | 56 | dev_packages.append("%s-dev" % pkg) |
| 57 | dbg_packages.append("%s-dbg" % pkg) | 57 | dbg_packages.append("%s-dbg" % pkg) |
| @@ -68,7 +68,7 @@ python __anonymous () { | |||
| 68 | ${includedir}/${QT_DIR_NAME}/%(incname)s | 68 | ${includedir}/${QT_DIR_NAME}/%(incname)s |
| 69 | ${libdir}/pkgconfig/%(name)s.pc""" % locals(), d) | 69 | ${libdir}/pkgconfig/%(name)s.pc""" % locals(), d) |
| 70 | bb.data.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s.so.*" % locals(), d) | 70 | bb.data.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s.so.*" % locals(), d) |
| 71 | bb.data.setVar("RRECOMMENDS_%s-dbg" % pkg, "${QT_BASE_NAME}-dbg", d) | 71 | bb.data.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg", d) |
| 72 | lib_packages.append(pkg) | 72 | lib_packages.append(pkg) |
| 73 | dev_packages.append("%s-dev" % pkg) | 73 | dev_packages.append("%s-dev" % pkg) |
| 74 | dbg_packages.append("%s-dbg" % pkg) | 74 | dbg_packages.append("%s-dbg" % pkg) |