mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 01:19:52 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
d5e67725ac
commit
c4e2c59088
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user