aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-08-21 16:08:32 +0300
committerPaul Eggleton <paul.eggleton@linux.intel.com>2013-10-10 12:21:00 +0100
commit280fab68c737938b938addd8a3dde1ae95ebf64d (patch)
treed969d54a86535a0c853f1a4576b2bda5aa3c3d99
parent0e4b2969283df4124d6edd58bbe7149221fb9362 (diff)
downloadopenembedded-core-280fab68c737938b938addd8a3dde1ae95ebf64d.tar.gz
boost: fix build when PARALLEL_MAKE is not set
It was passing "None" to bjam, which then parsed it as unknown build target. (From OE-Core rev: 0a323abab1961caa334035f4f263f1787b3d7cc7) Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/boost/boost.inc2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc
index 87bac23340..5d20b11e11 100644
--- a/meta/recipes-support/boost/boost.inc
+++ b/meta/recipes-support/boost/boost.inc
@@ -115,6 +115,8 @@ def get_boost_parallel_make(bb, d):
bb.error("Unable to analyse format of PARALLEL_MAKE variable: %s" % pm)
pm_nval = min(64, int(pm_val.group(0)))
return pm_prefix.group(0) + str(pm_nval) + pm[pm_val.end():]
+ else:
+ return ""
BOOST_PARALLEL_MAKE = "${@get_boost_parallel_make(bb, d)}"
BJAM_OPTS = '${BOOST_PARALLEL_MAKE} \