diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2013-06-26 19:19:32 +0200 |
|---|---|---|
| committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-07-08 16:28:29 +0100 |
| commit | 61831b8afac73496fb54583d95690cf6238286ac (patch) | |
| tree | 721d0e6d12fd00290b316a92a3642434713faa6a | |
| parent | dba106b4fc1579185498b85f6e1ade494fcc588e (diff) | |
| download | openembedded-core-61831b8afac73496fb54583d95690cf6238286ac.tar.gz openembedded-core-61831b8afac73496fb54583d95690cf6238286ac.tar.bz2 openembedded-core-61831b8afac73496fb54583d95690cf6238286ac.zip | |
boost: Limit PARALLEL_MAKE by -j 64
* greater paralelism isn't supported by bjam and causes segfault or ignoring -j
* PARALLEL_MAKE was enabled for boost in
http://git.openembedded.org/openembedded-core/commit/?id=9b9cfc1dfe5e3b8f89b7a8508537166d0f23935e
(From OE-Core master rev: c212f306934aa1c7c825e3bb060d4799be1efca1)
Signed-off-by: Martin Jansa <Martin.Jansa@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.inc | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index a1c35c7b95..87bac23340 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc @@ -102,8 +102,22 @@ BJAM_TOOLS = "-sTOOLS=gcc \ '--layout=system' \ " -#use PARALLEL_MAKE to speed up the build -BJAM_OPTS = '${PARALLEL_MAKE} \ +# use PARALLEL_MAKE to speed up the build, but limit it by -j 64, greater paralelism causes bjam to segfault or to ignore -j +# https://svn.boost.org/trac/boost/ticket/7634 +def get_boost_parallel_make(bb, d): + pm = d.getVar('PARALLEL_MAKE', True) + if pm: + # people are usually using "-jN" or "-j N", but let it work with something else appended to it + import re + pm_prefix = re.search("\D+", pm) + pm_val = re.search("\d+", pm) + if pm_prefix is None or pm_val is None: + 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():] + +BOOST_PARALLEL_MAKE = "${@get_boost_parallel_make(bb, d)}" +BJAM_OPTS = '${BOOST_PARALLEL_MAKE} \ ${BJAM_TOOLS} \ -sBOOST_BUILD_USER_CONFIG=${S}/tools/build/v2/user-config.jam \ --builddir=${S}/${TARGET_SYS} \ |