From ccd1142d22b31ed85d8823b1bc9e11ccfd72b61f Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Mon, 12 Feb 2018 13:39:58 -0600 Subject: utils.py: add parallel make helpers The code to extract the integer number of parallel build threads and construct a new argument from them has started to be copied in multiple locations, so create two new helper utilities to aid recipes. The first helper (parallel_make()) extracts the integer number of parallel build threads from PARALLEL_MAKE. The second (parallel_make_argument()) does the same and then puts the result back into a format string, optionally clamping it to some maximum value. Additionally, rework the oe-core recipes that were manually doing this to use the new helper utilities. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/classes/go.bbclass | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'meta/classes/go.bbclass') diff --git a/meta/classes/go.bbclass b/meta/classes/go.bbclass index 09b01a84c3..7ecd8c9254 100644 --- a/meta/classes/go.bbclass +++ b/meta/classes/go.bbclass @@ -1,23 +1,6 @@ inherit goarch ptest -def get_go_parallel_make(d): - pm = (d.getVar('PARALLEL_MAKE') or '').split() - # look for '-j' and throw other options (e.g. '-l') away - # because they might have a different meaning in golang - while pm: - opt = pm.pop(0) - if opt == '-j': - v = pm.pop(0) - elif opt.startswith('-j'): - v = opt[2:].strip() - else: - continue - - return '-p %d' % int(v) - - return "" - -GO_PARALLEL_BUILD ?= "${@get_go_parallel_make(d)}" +GO_PARALLEL_BUILD ?= "${@oe.utils.parallel_make_argument(d, '-p %d')}" GOROOT_class-native = "${STAGING_LIBDIR_NATIVE}/go" GOROOT_class-nativesdk = "${STAGING_DIR_TARGET}${libdir}/go" -- cgit v1.2.3