diff mbox series

[v2,19/22] waf.bbclass: drop usage of distutils

Message ID 3e30c1feaf6d008628b998c1703d50fa3b21c0a2.1641920605.git.tim.orling@konsulko.com
State Accepted, archived
Commit d4d57588eb7fcd25caf51450e0d19fc58e35a19d
Headers show
Series [v2,01/22] classes/distutils-*: add warning of deprecation | expand

Commit Message

Tim Orling Jan. 11, 2022, 7:01 p.m. UTC 
Refactor to use bb.utils.vercmp_string_op() instead of StrictVersion
from distutils

[YOCTO #14610]

Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
 meta/classes/waf.bbclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/meta/classes/waf.bbclass b/meta/classes/waf.bbclass
index df0ab8d73ff..bc594d3c6b1 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)