summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2013-06-26 19:19:32 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-28 09:14:06 +0100
commit171302f42eef25cda5213fa87b57cf5e261055f0 (patch)
tree97339424c94c310a10249e6b6146023dc5e185b5
parentaa8eba7eb942aab3287d7a7a9ec026e2ba1abee6 (diff)
downloadpoky-171302f42eef25cda5213fa87b57cf5e261055f0.tar.gz
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 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.inc18
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 \
102 '--layout=system' \ 102 '--layout=system' \
103 " 103 "
104 104
105#use PARALLEL_MAKE to speed up the build 105# use PARALLEL_MAKE to speed up the build, but limit it by -j 64, greater paralelism causes bjam to segfault or to ignore -j
106BJAM_OPTS = '${PARALLEL_MAKE} \ 106# https://svn.boost.org/trac/boost/ticket/7634
107def get_boost_parallel_make(bb, d):
108 pm = d.getVar('PARALLEL_MAKE', True)
109 if pm:
110 # people are usually using "-jN" or "-j N", but let it work with something else appended to it
111 import re
112 pm_prefix = re.search("\D+", pm)
113 pm_val = re.search("\d+", pm)
114 if pm_prefix is None or pm_val is None:
115 bb.error("Unable to analyse format of PARALLEL_MAKE variable: %s" % pm)
116 pm_nval = min(64, int(pm_val.group(0)))
117 return pm_prefix.group(0) + str(pm_nval) + pm[pm_val.end():]
118
119BOOST_PARALLEL_MAKE = "${@get_boost_parallel_make(bb, d)}"
120BJAM_OPTS = '${BOOST_PARALLEL_MAKE} \
107 ${BJAM_TOOLS} \ 121 ${BJAM_TOOLS} \
108 -sBOOST_BUILD_USER_CONFIG=${S}/tools/build/v2/user-config.jam \ 122 -sBOOST_BUILD_USER_CONFIG=${S}/tools/build/v2/user-config.jam \
109 --builddir=${S}/${TARGET_SYS} \ 123 --builddir=${S}/${TARGET_SYS} \