summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-09 15:00:01 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-10 11:51:19 (GMT)
commitc8dee9b92dfd545852ecac8dc2adfc95ac02e957 (patch)
tree5f1b86954646a0f3bb914407994388a6a4346769 /meta/recipes-qt
parent5d3860f4a8abb8e95442b04f8b84a333af362fcd (diff)
downloadpoky-c8dee9b92dfd545852ecac8dc2adfc95ac02e957.tar.gz
Convert to use direct access to the data store (instead of bb.data.*Var*())
This is the result of running the following over the metadata: sed \ -e 's:bb.data.\(setVar([^,()]*,[^,()]*\), *\([^ )]*\) *):\2.\1):g' \ -e 's:bb.data.\(setVarFlag([^,()]*,[^,()]*,[^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^() ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -i `grep -ril bb.data *` (From OE-Core rev: b22831fd63164c4db9c0b72934d7d734a6585251) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/qt4.inc20
-rw-r--r--meta/recipes-qt/qt4/qt4_arch.inc6
2 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 1406a87..82ba637 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -39,8 +39,8 @@ python __anonymous () {
39 lib_packages = [] 39 lib_packages = []
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 d.getVar("QT_LIB_NAMES", 1).split():
43 pkg = bb.data.getVar("QT_BASE_LIB",d, 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 bb.data.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s${QT_LIBINFIX}.so.*" % locals(), d)
@@ -51,15 +51,15 @@ 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, "${PN}-dbg", d) 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)
57 dbg_packages.append("%s-dbg" % pkg) 57 dbg_packages.append("%s-dbg" % pkg)
58 for name in bb.data.getVar("OTHER_PACKAGES", d, 1).split(): 58 for name in d.getVar("OTHER_PACKAGES", 1).split():
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 d.getVar("QT_EXTRA_LIBS", 1).split():
62 pkg = bb.data.getVar("QT_BASE_LIB",d, 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 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
@@ -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, "${PN}-dbg", d) 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)
@@ -256,14 +256,14 @@ python populate_packages_prepend() {
256 do_split_packages(d, plugin_dir, glob, plugin_name, '${PN} %s for %%s' % name, extra_depends='', hook=dev_hook) 256 do_split_packages(d, plugin_dir, glob, plugin_name, '${PN} %s for %%s' % name, extra_depends='', hook=dev_hook)
257 # Create a -dbg package as well 257 # Create a -dbg package as well
258 plugin_dir_dbg = bb.data.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/.debug' % path, d) 258 plugin_dir_dbg = bb.data.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/.debug' % path, d)
259 packages = bb.data.getVar('PACKAGES',d) 259 packages = d.getVar('PACKAGES')
260 for (file,package) in dev_packages: 260 for (file,package) in dev_packages:
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 bb.data.setVar("FILES_%s-dbg" % package, file_name, d) 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 bb.data.setVar("DESCRIPTION_%s-dbg" % package, "${PN} %s for %s" % (name, package), d)
265 265
266 bb.data.setVar('PACKAGES', packages, d) 266 d.setVar('PACKAGES', packages)
267 267
268 qtopia_split('accessible', 'accessible', '^libq(.*)\.so$') 268 qtopia_split('accessible', 'accessible', '^libq(.*)\.so$')
269 qtopia_split('codecs', 'codec', '^libq(.*)\.so$') 269 qtopia_split('codecs', 'codec', '^libq(.*)\.so$')
diff --git a/meta/recipes-qt/qt4/qt4_arch.inc b/meta/recipes-qt/qt4/qt4_arch.inc
index e8c8fab..46d65a2 100644
--- a/meta/recipes-qt/qt4/qt4_arch.inc
+++ b/meta/recipes-qt/qt4/qt4_arch.inc
@@ -4,7 +4,7 @@ ARM_INSTRUCTION_SET = "arm"
4 4
5def qt_arch(d): 5def qt_arch(d):
6 import bb, re 6 import bb, re
7 arch = bb.data.getVar('TARGET_ARCH', d, 1) 7 arch = d.getVar('TARGET_ARCH', 1)
8 if re.match("^i.86$", arch): 8 if re.match("^i.86$", arch):
9 arch = "i386" 9 arch = "i386"
10 elif re.match("^arm.*", arch): 10 elif re.match("^arm.*", arch):
@@ -17,9 +17,9 @@ def qt_arch(d):
17 17
18def qt_endian(d): 18def qt_endian(d):
19 import bb 19 import bb
20 if bb.data.getVar('SITEINFO_ENDIANNESS', d, True) == "le": 20 if d.getVar('SITEINFO_ENDIANNESS', True) == "le":
21 return "-little-endian" 21 return "-little-endian"
22 elif bb.data.getVar('SITEINFO_ENDIANNESS', d, True) == "be": 22 elif d.getVar('SITEINFO_ENDIANNESS', True) == "be":
23 return "-big-endian" 23 return "-big-endian"
24 else: 24 else:
25 assert False 25 assert False