From 7b437037950ab01f3b68ab040ca10210b2023c4c Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Tue, 11 Jan 2022 11:01:28 -0800 Subject: waf.bbclass: drop usage of distutils Refactor to use bb.utils.vercmp_string_op() instead of StrictVersion from distutils [YOCTO #14610] (From OE-Core rev: d4d57588eb7fcd25caf51450e0d19fc58e35a19d) Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- meta/classes/waf.bbclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/classes/waf.bbclass b/meta/classes/waf.bbclass index df0ab8d73f..bc594d3c6b 100644 --- a/meta/classes/waf.bbclass +++ b/meta/classes/waf.bbclass @@ -43,14 +43,13 @@ BB_HASHBASE_WHITELIST += "WAFLOCK" python waf_preconfigure() { import subprocess - from distutils.version import StrictVersion subsrcdir = d.getVar('S') python = d.getVar('WAF_PYTHON') wafbin = os.path.join(subsrcdir, 'waf') try: result = subprocess.check_output([python, wafbin, '--version'], cwd=subsrcdir, stderr=subprocess.STDOUT) version = result.decode('utf-8').split()[1] - if StrictVersion(version) >= StrictVersion("1.8.7"): + if bb.utils.vercmp_string_op(version, "1.8.7", ">="): d.setVar("WAF_EXTRA_CONF", "--bindir=${bindir} --libdir=${libdir}") except subprocess.CalledProcessError as e: bb.warn("Unable to execute waf --version, exit code %d. Assuming waf version without bindir/libdir support." % e.returncode) -- cgit v1.2.3-54-g00ecf