Patchwork [1/1] boost: fix build when PARALLEL_MAKE is not set

login
register
mail settings
Submitter Marko Lindqvist
Date Aug. 21, 2013, 1:08 p.m.
Message ID <7dddce57f33686ce5c2903e8a91f94cefd75c043.1377090438.git.cazfi74@gmail.com>
Download mbox | patch
Permalink /patch/56123/
State Accepted
Commit e498471b0fc58fd27af4e493d7f7c5e4d2fc4da7
Headers show

Comments

Marko Lindqvist - Aug. 21, 2013, 1:08 p.m.
It was passing "None" to bjam, which then parsed it as unknown build target.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 meta/recipes-support/boost/boost.inc |    2 ++
 1 file changed, 2 insertions(+)

Patch

diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc
index 87bac23..5d20b11 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} \