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

login
register
mail settings
Submitter Yu Ke
Date Aug. 15, 2011, 12:33 p.m.
Message ID <f49ee37a4a630a5dbbc1dea6881032b2b5267ef0.1313411289.git.ke.yu@intel.com>
Download mbox | patch
Permalink /patch/9851/
State New, archived
Headers show

Comments

Yu Ke - Aug. 15, 2011, 12:33 p.m.
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 <ke.yu@intel.com>
---
 meta/recipes-qt/qt4/qt4.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 4d26c64..1f4e012 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -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