diff options
author | Marko Lindqvist <cazfi74@gmail.com> | 2013-08-21 16:08:32 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-22 18:30:05 +0100 |
commit | e498471b0fc58fd27af4e493d7f7c5e4d2fc4da7 (patch) | |
tree | 9afaf6f16e6f3e538374bfcf3769875daca77789 /meta | |
parent | 068069bb1a07b19d531ba47019f68b5d9234962c (diff) | |
download | poky-e498471b0fc58fd27af4e493d7f7c5e4d2fc4da7.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>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/boost/boost.inc | 2 |
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): | |||
115 | bb.error("Unable to analyse format of PARALLEL_MAKE variable: %s" % pm) | 115 | bb.error("Unable to analyse format of PARALLEL_MAKE variable: %s" % pm) |
116 | pm_nval = min(64, int(pm_val.group(0))) | 116 | pm_nval = min(64, int(pm_val.group(0))) |
117 | return pm_prefix.group(0) + str(pm_nval) + pm[pm_val.end():] | 117 | return pm_prefix.group(0) + str(pm_nval) + pm[pm_val.end():] |
118 | else: | ||
119 | return "" | ||
118 | 120 | ||
119 | BOOST_PARALLEL_MAKE = "${@get_boost_parallel_make(bb, d)}" | 121 | BOOST_PARALLEL_MAKE = "${@get_boost_parallel_make(bb, d)}" |
120 | BJAM_OPTS = '${BOOST_PARALLEL_MAKE} \ | 122 | BJAM_OPTS = '${BOOST_PARALLEL_MAKE} \ |