Skip to contentSkip to conversation

two qt fix

PATCH Applied Yu Ke 2 participants 4 messages Aug 15, 2011

lore
Share & tools
lore

Yu Ke

author
#0 lore raw

cover two qt fix

The following changes since commit d126e22f6b3f27196144f87e22b36ebccd6dea65:
Darren Hart (1):
rt-tests: use an explicit commit ID

are available in the git repository at:

git://git.pokylinux.org/poky-contrib kyu3/bug-1344
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/bug-1344

Yu Ke (2):
qt4.inc: revise RRECOMMENDS
qt4.inc: expand the package name for multilib case

 meta/recipes-qt/qt4/qt4.inc |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
author
#1 lore raw

PATCH 1/2 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}

Signed-off-by Yu Ke <[email protected]>
---
 meta/recipes-qt/qt4/qt4.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-qt/qt4/qt4.inc +2 -2
index 881b445..4d26c64 100644
@@ -51,7 +51,7 @@ python __anonymous () {
                   ${includedir}/${QT_DIR_NAME}/%(incname)s
                   ${libdir}/pkgconfig/%(name)s${QT_LIBINFIX}.pc""" % locals(), d)
         bb.data.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s${QT_LIBINFIX}.so.*" % locals(), d)
-        bb.data.setVar("RRECOMMENDS_%s-dbg" % pkg, "${QT_BASE_NAME}-dbg", d)
+        bb.data.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg", d)
         lib_packages.append(pkg)
         dev_packages.append("%s-dev" % pkg)
         dbg_packages.append("%s-dbg" % pkg)

@@ -68,7 +68,7 @@ python __anonymous () {
                   ${includedir}/${QT_DIR_NAME}/%(incname)s
                   ${libdir}/pkgconfig/%(name)s.pc""" % locals(), d)
         bb.data.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s.so.*" % locals(), d)
-        bb.data.setVar("RRECOMMENDS_%s-dbg" % pkg, "${QT_BASE_NAME}-dbg", d)
+        bb.data.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg", d)
         lib_packages.append(pkg)
         dev_packages.append("%s-dev" % pkg)
         dbg_packages.append("%s-dbg" % pkg)
Signature · 1 line
1.7.0.4
author
#2 lore raw

PATCH 2/2 qt4.inc: expand the package name for multilib case, fix bug 1344

In reply to Yu Ke

in the qt4.inc python annomyous code, there is case where package name is set to "${QT_BASE_LIB}-tool", and FILE_${QT_BASE_LIB}-tool is set to xxx. here QT_BASE_NAME=qt4. multilib.bbclass will try to rename the FILE_qt4_tool to FILE_lib64_qt4_tool. unfortunately, there is only FILE_${QT_BASE}-tool, no FILE_qt4-tool, so FILE_lib64_qt4_tool will not be defined.

to fix this issue, this patch expand the QT_BASE_LIB when assigning the package name.

FIX [YOCTO #1344]

Signed-off-by Yu Ke <[email protected]>
---
 meta/recipes-qt/qt4/qt4.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-qt/qt4/qt4.inc +2 -2
index 4d26c64..1f4e012 100644
@@ -40,7 +40,7 @@ python __anonymous () {
     dev_packages = []
     dbg_packages = []
     for name in bb.data.getVar("QT_LIB_NAMES", d, 1).split():
-        pkg = "${QT_BASE_LIB}" + name.lower().replace("qt", "").replace("_", "-") + "4"
+        pkg = bb.data.getVar("QT_BASE_LIB",d, True) + name.lower().replace("qt", "").replace("_", "-") + "4"
         # NOTE: the headers for QtAssistantClient are different
         incname = name.replace("QtAssistantClient", "QtAssistant")
         bb.data.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s${QT_LIBINFIX}.so.*" % locals(), d)

@@ -59,7 +59,7 @@ python __anonymous () {
         dbg_packages.append("%s-dbg" % name)
 
     for name in bb.data.getVar("QT_EXTRA_LIBS", d, 1).split():
-        pkg = "${QT_BASE_LIB}" + name.lower().replace("qt", "").replace("_", "-") + "4"
+        pkg = bb.data.getVar("QT_BASE_LIB",d, True) + name.lower().replace("qt", "").replace("_", "-") + "4"
         bb.data.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s.so.*" % locals(), d)
         bb.data.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s.prl
                   ${libdir}/lib%(name)s.a
Signature · 1 line
1.7.0.4
Applied
#3 lore raw
In reply to Yu Ke
Quoted 4 lines · Yu Ke

The following changes since commit d126e22f6b3f27196144f87e22b36ebccd6dea65:
Darren Hart (1):
rt-tests: use an explicit commit ID

Quoted 8 lines

are available in the git repository at:

git://git.pokylinux.org/poky-contrib kyu3/bug-1344
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/bug-1344

Yu Ke (2):
qt4.inc: revise RRECOMMENDS
qt4.inc: expand the package name for multilib case

Merged to master, thanks.

Richard