Using re.compile() is around six times faster than recompiling the regexp each time so maintain a cache.
Signed-off-by: Richard Purdie <[email protected]> --- meta/classes/sstate.bbclass | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 6f2fa583f29..c0e54a398d6 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -980,9 +980,16 @@ def setscene_depvalid(task, taskdependees, notneeded, d, log=None): # them in. # See also http://lists.openembedded.org/pipermail/openembedded-core/2018-January/146324.html not_needed = False - for excl in (d.getVar('SSTATE_EXCLUDEDEPS_SYSROOT') or "").split(): - if re.match(excl.split('->', 1)[0], taskdependees[dep][0]): - if re.match(excl.split('->', 1)[1], taskdependees[task][0]): + excludedeps = d.getVar('_SSTATE_EXCLUDEDEPS_SYSROOT') + if excludedeps is None: + # Cache the regular expressions for speed + excludedeps = [] + for excl in (d.getVar('SSTATE_EXCLUDEDEPS_SYSROOT') or "").split(): + excludedeps.append((re.compile(excl.split('->', 1)[0]), re.compile(excl.split('->', 1)[1]))) + d.setVar('_SSTATE_EXCLUDEDEPS_SYSROOT', excludedeps) + for excl in excludedeps: + if excl[0].match(taskdependees[dep][0]): + if excl[1].match(taskdependees[task][0]): not_needed = True break if not_needed: -- 2.17.1 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
