diff options
| author |   Tim Orling <ticotimo@gmail.com> | 2022-01-11 11:01:28 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-01-12 21:05:28 +0000 |
| commit | d4d57588eb7fcd25caf51450e0d19fc58e35a19d (patch) | |
| tree | 7d2a78730f6d554b61f7bddbcf40ad1378d7a1c7 /meta/classes/waf.bbclass | |
| parent | 619a3eb1266459daf16e10386113e9201fbf9cf5 (diff) | |
| download | openembedded-core-d4d57588eb7fcd25caf51450e0d19fc58e35a19d.tar.gz | |
waf.bbclass: drop usage of distutils
Refactor to use bb.utils.vercmp_string_op() instead of StrictVersion
from distutils
[YOCTO #14610]
Signed-off-by: Tim Orling <tim.orling@konsulko.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/waf.bbclass')
| -rw-r--r-- | meta/classes/waf.bbclass | 3 |
1 files changed, 1 insertions, 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) |