From 7c552996597faaee2fbee185b250c0ee30ea3b5f Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Wed, 14 Dec 2016 21:13:04 +0000 Subject: 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\) Signed-off-by: Joshua Lock Signed-off-by: Ross Burton --- meta/recipes-support/boost/boost-1.62.0.inc | 4 ++-- meta/recipes-support/boost/boost.inc | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'meta/recipes-support/boost') 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/" LICENSE = "BSL-1.0 & MIT & Python-2.0" LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" -BOOST_VER = "${@"_".join(d.getVar("PV", True).split("."))}" -BOOST_MAJ = "${@"_".join(d.getVar("PV", True).split(".")[0:2])}" +BOOST_VER = "${@"_".join(d.getVar("PV").split("."))}" +BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" BOOST_P = "boost_${BOOST_VER}" 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}" python __anonymous () { packages = [] extras = [] - for lib in d.getVar('BOOST_LIBS', True).split( ): + for lib in d.getVar('BOOST_LIBS').split( ): # BJAM does not know '--with-python3' (only --with-python) if lib != "python3": extras.append("--with-%s" % lib) @@ -67,10 +67,10 @@ python __anonymous () { packages.append(pkg) if lib == "python": # special: python*.so matches python3.so !! - if not d.getVar("FILES_%s" % pkg, True): + if not d.getVar("FILES_%s" % pkg): d.setVar("FILES_%s" % pkg, "${libdir}/libboost_%s.so.*" % lib) else: - if not d.getVar("FILES_%s" % pkg, True): + if not d.getVar("FILES_%s" % pkg): d.setVar("FILES_%s" % pkg, "${libdir}/libboost_%s*.so.*" % lib) d.setVar("BOOST_PACKAGES", " ".join(packages)) d.setVar("BJAM_EXTRA", " ".join(extras)) @@ -145,7 +145,7 @@ BJAM_TOOLS = "--ignore-site-config \ # use PARALLEL_MAKE to speed up the build, but limit it by -j 64, greater parallelism causes bjam to segfault or to ignore -j # https://svn.boost.org/trac/boost/ticket/7634 def get_boost_parallel_make(d): - pm = d.getVar('PARALLEL_MAKE', True) + pm = d.getVar('PARALLEL_MAKE') if pm: # look for '-j' and throw other options (e.g. '-l') away # because they might have different meaning in bjam -- cgit 1.2.3-korg