diff options
| author | Joshua Lock <joshua.g.lock@intel.com> | 2016-12-14 21:13:04 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-16 10:23:23 +0000 |
| commit | c4e2c59088765d1f1de7ec57cde91980f887c2ff (patch) | |
| tree | a2fda8ac5916fb59a711e9220c2177008cca9347 /meta/recipes-support/boost | |
| parent | d5e67725ac11e3296cad104470931ffa16824b90 (diff) | |
| download | poky-c4e2c59088765d1f1de7ec57cde91980f887c2ff.tar.gz | |
meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
(From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/boost')
| -rw-r--r-- | meta/recipes-support/boost/boost-1.62.0.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-support/boost/boost.inc | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-support/boost/boost-1.62.0.inc b/meta/recipes-support/boost/boost-1.62.0.inc index 1e555e19bf..1138de61f1 100644 --- a/meta/recipes-support/boost/boost-1.62.0.inc +++ b/meta/recipes-support/boost/boost-1.62.0.inc | |||
| @@ -7,8 +7,8 @@ HOMEPAGE = "http://www.boost.org/" | |||
| 7 | LICENSE = "BSL-1.0 & MIT & Python-2.0" | 7 | LICENSE = "BSL-1.0 & MIT & Python-2.0" |
| 8 | LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" | 8 | LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" |
| 9 | 9 | ||
| 10 | BOOST_VER = "${@"_".join(d.getVar("PV", True).split("."))}" | 10 | BOOST_VER = "${@"_".join(d.getVar("PV").split("."))}" |
| 11 | BOOST_MAJ = "${@"_".join(d.getVar("PV", True).split(".")[0:2])}" | 11 | BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" |
| 12 | BOOST_P = "boost_${BOOST_VER}" | 12 | BOOST_P = "boost_${BOOST_VER}" |
| 13 | 13 | ||
| 14 | SRC_URI = "${SOURCEFORGE_MIRROR}/project/boost/boost/${PV}/${BOOST_P}.tar.bz2" | 14 | SRC_URI = "${SOURCEFORGE_MIRROR}/project/boost/boost/${PV}/${BOOST_P}.tar.bz2" |
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index 1966d3d807..a1a6a90f9c 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc | |||
| @@ -59,7 +59,7 @@ PACKAGES = "${PN}-dbg ${BOOST_PACKAGES}" | |||
| 59 | python __anonymous () { | 59 | python __anonymous () { |
| 60 | packages = [] | 60 | packages = [] |
| 61 | extras = [] | 61 | extras = [] |
| 62 | for lib in d.getVar('BOOST_LIBS', True).split( ): | 62 | for lib in d.getVar('BOOST_LIBS').split( ): |
| 63 | # BJAM does not know '--with-python3' (only --with-python) | 63 | # BJAM does not know '--with-python3' (only --with-python) |
| 64 | if lib != "python3": | 64 | if lib != "python3": |
| 65 | extras.append("--with-%s" % lib) | 65 | extras.append("--with-%s" % lib) |
| @@ -67,10 +67,10 @@ python __anonymous () { | |||
| 67 | packages.append(pkg) | 67 | packages.append(pkg) |
| 68 | if lib == "python": | 68 | if lib == "python": |
| 69 | # special: python*.so matches python3.so !! | 69 | # special: python*.so matches python3.so !! |
| 70 | if not d.getVar("FILES_%s" % pkg, True): | 70 | if not d.getVar("FILES_%s" % pkg): |
| 71 | d.setVar("FILES_%s" % pkg, "${libdir}/libboost_%s.so.*" % lib) | 71 | d.setVar("FILES_%s" % pkg, "${libdir}/libboost_%s.so.*" % lib) |
| 72 | else: | 72 | else: |
| 73 | if not d.getVar("FILES_%s" % pkg, True): | 73 | if not d.getVar("FILES_%s" % pkg): |
| 74 | d.setVar("FILES_%s" % pkg, "${libdir}/libboost_%s*.so.*" % lib) | 74 | d.setVar("FILES_%s" % pkg, "${libdir}/libboost_%s*.so.*" % lib) |
| 75 | d.setVar("BOOST_PACKAGES", " ".join(packages)) | 75 | d.setVar("BOOST_PACKAGES", " ".join(packages)) |
| 76 | d.setVar("BJAM_EXTRA", " ".join(extras)) | 76 | d.setVar("BJAM_EXTRA", " ".join(extras)) |
| @@ -145,7 +145,7 @@ BJAM_TOOLS = "--ignore-site-config \ | |||
| 145 | # use PARALLEL_MAKE to speed up the build, but limit it by -j 64, greater parallelism causes bjam to segfault or to ignore -j | 145 | # use PARALLEL_MAKE to speed up the build, but limit it by -j 64, greater parallelism causes bjam to segfault or to ignore -j |
| 146 | # https://svn.boost.org/trac/boost/ticket/7634 | 146 | # https://svn.boost.org/trac/boost/ticket/7634 |
| 147 | def get_boost_parallel_make(d): | 147 | def get_boost_parallel_make(d): |
| 148 | pm = d.getVar('PARALLEL_MAKE', True) | 148 | pm = d.getVar('PARALLEL_MAKE') |
| 149 | if pm: | 149 | if pm: |
| 150 | # look for '-j' and throw other options (e.g. '-l') away | 150 | # look for '-j' and throw other options (e.g. '-l') away |
| 151 | # because they might have different meaning in bjam | 151 | # because they might have different meaning in bjam |
