summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/boost/boost.inc24
1 files changed, 1 insertions, 23 deletions
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc
index 41fc90fb21..0461ec6fcf 100644
--- a/meta/recipes-support/boost/boost.inc
+++ b/meta/recipes-support/boost/boost.inc
@@ -135,29 +135,7 @@ BJAM_TOOLS = "--ignore-site-config \
135 135
136# use PARALLEL_MAKE to speed up the build, but limit it by -j 64, greater parallelism causes bjam to segfault or to ignore -j 136# use PARALLEL_MAKE to speed up the build, but limit it by -j 64, greater parallelism causes bjam to segfault or to ignore -j
137# https://svn.boost.org/trac/boost/ticket/7634 137# https://svn.boost.org/trac/boost/ticket/7634
138def get_boost_parallel_make(d): 138BOOST_PARALLEL_MAKE = "${@oe.utils.parallel_make_argument(d, '-j%d', limit=64)}"
139 pm = d.getVar('PARALLEL_MAKE')
140 if pm:
141 # look for '-j' and throw other options (e.g. '-l') away
142 # because they might have different meaning in bjam
143 pm = pm.split()
144 while pm:
145 v = None
146 opt = pm.pop(0)
147 if opt == '-j':
148 v = pm.pop(0)
149 elif opt.startswith('-j'):
150 v = opt[2:].strip()
151 else:
152 v = None
153
154 if v:
155 v = min(64, int(v))
156 return '-j' + str(v)
157
158 return ""
159
160BOOST_PARALLEL_MAKE = "${@get_boost_parallel_make(d)}"
161BJAM_OPTS = '${BOOST_PARALLEL_MAKE} -d+2 -q \ 139BJAM_OPTS = '${BOOST_PARALLEL_MAKE} -d+2 -q \
162 ${BJAM_TOOLS} \ 140 ${BJAM_TOOLS} \
163 -sBOOST_BUILD_USER_CONFIG=${WORKDIR}/user-config.jam \ 141 -sBOOST_BUILD_USER_CONFIG=${WORKDIR}/user-config.jam \