summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorYu Ke <ke.yu@intel.com>2011-08-15 10:39:16 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-15 14:26:21 (GMT)
commit16bbb3144cede1c4aaf70be1921b4290a45ae5eb (patch)
tree6925689b991ed07ef95ac0cb9d53373dc720b2ad /meta/recipes-qt
parentc3a66d99193f7e12b4f9944a34974c824c6ba78d (diff)
downloadpoky-16bbb3144cede1c4aaf70be1921b4290a45ae5eb.tar.gz
qt4.inc: expand the package name for multilib case
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] (From OE-Core rev: b5d381133660fe338796b965131cee39cec01b96) 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.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index a68a2e4..0410a92 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -40,7 +40,7 @@ python __anonymous () {
40 dev_packages = [] 40 dev_packages = []
41 dbg_packages = [] 41 dbg_packages = []
42 for name in bb.data.getVar("QT_LIB_NAMES", d, 1).split(): 42 for name in bb.data.getVar("QT_LIB_NAMES", d, 1).split():
43 pkg = "${QT_BASE_LIB}" + name.lower().replace("qt", "").replace("_", "-") + "4" 43 pkg = bb.data.getVar("QT_BASE_LIB",d, True) + name.lower().replace("qt", "").replace("_", "-") + "4"
44 # NOTE: the headers for QtAssistantClient are different 44 # NOTE: the headers for QtAssistantClient are different
45 incname = name.replace("QtAssistantClient", "QtAssistant") 45 incname = name.replace("QtAssistantClient", "QtAssistant")
46 bb.data.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s${QT_LIBINFIX}.so.*" % locals(), d) 46 bb.data.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s${QT_LIBINFIX}.so.*" % locals(), d)
@@ -59,7 +59,7 @@ python __anonymous () {
59 dbg_packages.append("%s-dbg" % name) 59 dbg_packages.append("%s-dbg" % name)
60 60
61 for name in bb.data.getVar("QT_EXTRA_LIBS", d, 1).split(): 61 for name in bb.data.getVar("QT_EXTRA_LIBS", d, 1).split():
62 pkg = "${QT_BASE_LIB}" + name.lower().replace("qt", "").replace("_", "-") + "4" 62 pkg = bb.data.getVar("QT_BASE_LIB",d, True) + name.lower().replace("qt", "").replace("_", "-") + "4"
63 bb.data.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s.so.*" % locals(), d) 63 bb.data.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s.so.*" % locals(), d)
64 bb.data.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s.prl 64 bb.data.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s.prl
65 ${libdir}/lib%(name)s.a 65 ${libdir}/lib%(name)s.a