diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-09 15:00:01 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-10 11:51:19 +0000 |
commit | c8dee9b92dfd545852ecac8dc2adfc95ac02e957 (patch) | |
tree | 5f1b86954646a0f3bb914407994388a6a4346769 /meta/recipes-support/boost | |
parent | 5d3860f4a8abb8e95442b04f8b84a333af362fcd (diff) | |
download | poky-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-support/boost')
-rw-r--r-- | meta/recipes-support/boost/boost-36.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-support/boost/boost-36.inc b/meta/recipes-support/boost/boost-36.inc index bb267d791c..8b0622f6ba 100644 --- a/meta/recipes-support/boost/boost-36.inc +++ b/meta/recipes-support/boost/boost-36.inc | |||
@@ -11,8 +11,8 @@ LICENSE = "Boost" | |||
11 | PR = "r4" | 11 | PR = "r4" |
12 | 12 | ||
13 | ARM_INSTRUCTION_SET = "arm" | 13 | ARM_INSTRUCTION_SET = "arm" |
14 | BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}" | 14 | BOOST_VER = "${@"_".join(d.getVar("PV",1).split("."))}" |
15 | BOOST_MAJ = "${@"_".join(bb.data.getVar("PV",d,1).split(".")[0:2])}" | 15 | BOOST_MAJ = "${@"_".join(d.getVar("PV",1).split(".")[0:2])}" |
16 | BOOST_P = "boost_${BOOST_VER}" | 16 | BOOST_P = "boost_${BOOST_VER}" |
17 | 17 | ||
18 | BOOST_LIBS = "\ | 18 | BOOST_LIBS = "\ |
@@ -46,12 +46,12 @@ python __anonymous () { | |||
46 | 46 | ||
47 | packages = [] | 47 | packages = [] |
48 | extras = [] | 48 | extras = [] |
49 | for lib in bb.data.getVar('BOOST_LIBS', d, 1).split( ): | 49 | for lib in d.getVar('BOOST_LIBS', 1).split( ): |
50 | pkg = "boost-%s" % lib.replace("_", "-") | 50 | pkg = "boost-%s" % lib.replace("_", "-") |
51 | extras.append("--with-%s" % lib) | 51 | extras.append("--with-%s" % lib) |
52 | packages.append(pkg) | 52 | packages.append(pkg) |
53 | if not bb.data.getVar("FILES_%s" % pkg, d, 1): | 53 | if not d.getVar("FILES_%s" % pkg, 1): |
54 | bb.data.setVar("FILES_%s" % pkg, "${libdir}/libboost_%s*.so.*" % lib, d) | 54 | d.setVar("FILES_%s" % pkg, "${libdir}/libboost_%s*.so.*" % lib) |
55 | bb.data.setVar("BOOST_PACKAGES", " ".join(packages), d) | 55 | bb.data.setVar("BOOST_PACKAGES", " ".join(packages), d) |
56 | bb.data.setVar("BJAM_EXTRA", " ".join(extras), d) | 56 | bb.data.setVar("BJAM_EXTRA", " ".join(extras), d) |
57 | } | 57 | } |