mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 05:09:24 +00:00
Code Issues Projects Releases Wiki Activity

waf.bbclass: drop usage of distutils

Browse Source 
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 <tim.orling@konsulko.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Tim Orling
2022-01-11 11:01:28 -08:00
committed by Richard Purdie
parent fe86a14649
commit 7b43703795
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/waf.bbclass
+1 -2
View File
@@ -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)