summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-25 14:25:16 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-27 10:25:34 (GMT)
commit0a434ac10158e2011d41a1189e65e9474b1672be (patch)
tree6171516b25cb337343a6373e34aec0d061e4f5e8 /meta/recipes-qt
parent71fded5145454b144413057e11f78f718d947093 (diff)
downloadpoky-0a434ac10158e2011d41a1189e65e9474b1672be.tar.gz
getVar/setVar cleanups
Complete the bb.data.getVar/setVar replacements with accesses directly to the data store object. (From OE-Core rev: 2864ff6a4b3c3f9b3bbb6d2597243cc5d3715939) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/qt4.inc24
1 files changed, 12 insertions, 12 deletions
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 82ba637..4dc9a75 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -43,14 +43,14 @@ python __anonymous () {
43 pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt", "").replace("_", "-") + "4" 43 pkg = d.getVar("QT_BASE_LIB", 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 d.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s${QT_LIBINFIX}.so.*" % locals())
47 bb.data.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s${QT_LIBINFIX}.prl 47 d.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s${QT_LIBINFIX}.prl
48 ${libdir}/lib%(name)s${QT_LIBINFIX}.a 48 ${libdir}/lib%(name)s${QT_LIBINFIX}.a
49 ${libdir}/lib%(name)s${QT_LIBINFIX}.la 49 ${libdir}/lib%(name)s${QT_LIBINFIX}.la
50 ${libdir}/lib%(name)s${QT_LIBINFIX}.so 50 ${libdir}/lib%(name)s${QT_LIBINFIX}.so
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())
53 bb.data.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s${QT_LIBINFIX}.so*" % locals(), d) 53 d.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s${QT_LIBINFIX}.so*" % locals())
54 d.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg") 54 d.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg")
55 lib_packages.append(pkg) 55 lib_packages.append(pkg)
56 dev_packages.append("%s-dev" % pkg) 56 dev_packages.append("%s-dev" % pkg)
@@ -60,22 +60,22 @@ python __anonymous () {
60 60
61 for name in d.getVar("QT_EXTRA_LIBS", 1).split(): 61 for name in d.getVar("QT_EXTRA_LIBS", 1).split():
62 pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt", "").replace("_", "-") + "4" 62 pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt", "").replace("_", "-") + "4"
63 bb.data.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s.so.*" % locals(), d) 63 d.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s.so.*" % locals())
64 bb.data.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s.prl 64 d.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s.prl
65 ${libdir}/lib%(name)s.a 65 ${libdir}/lib%(name)s.a
66 ${libdir}/lib%(name)s.la 66 ${libdir}/lib%(name)s.la
67 ${libdir}/lib%(name)s.so 67 ${libdir}/lib%(name)s.so
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())
70 bb.data.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s.so*" % locals(), d) 70 d.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s.so*" % locals())
71 d.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg") 71 d.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg")
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)
75 75
76 bb.data.setVar("LIB_PACKAGES", " ".join(lib_packages), d) 76 d.setVar("LIB_PACKAGES", " ".join(lib_packages))
77 bb.data.setVar("DEV_PACKAGES", " ".join(dev_packages), d) 77 d.setVar("DEV_PACKAGES", " ".join(dev_packages))
78 bb.data.setVar("DBG_PACKAGES", " ".join(dbg_packages), d) 78 d.setVar("DBG_PACKAGES", " ".join(dbg_packages))
79} 79}
80 80
81OTHER_PACKAGES = "\ 81OTHER_PACKAGES = "\
@@ -261,7 +261,7 @@ python populate_packages_prepend() {
261 packages = "%s %s-dbg" % (packages, package) 261 packages = "%s %s-dbg" % (packages, package)
262 file_name = os.path.join(plugin_dir_dbg, os.path.basename(file)) 262 file_name = os.path.join(plugin_dir_dbg, os.path.basename(file))
263 d.setVar("FILES_%s-dbg" % package, file_name) 263 d.setVar("FILES_%s-dbg" % package, file_name)
264 bb.data.setVar("DESCRIPTION_%s-dbg" % package, "${PN} %s for %s" % (name, package), d) 264 d.setVar("DESCRIPTION_%s-dbg" % package, "${PN} %s for %s" % (name, package))
265 265
266 d.setVar('PACKAGES', packages) 266 d.setVar('PACKAGES', packages)
267 267