diff options
| -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" | |||
| 43 | 43 | ||
| 44 | python waf_preconfigure() { | 44 | python waf_preconfigure() { |
| 45 | import subprocess | 45 | import subprocess |
| 46 | from distutils.version import StrictVersion | ||
| 47 | subsrcdir = d.getVar('S') | 46 | subsrcdir = d.getVar('S') |
| 48 | python = d.getVar('WAF_PYTHON') | 47 | python = d.getVar('WAF_PYTHON') |
| 49 | wafbin = os.path.join(subsrcdir, 'waf') | 48 | wafbin = os.path.join(subsrcdir, 'waf') |
| 50 | try: | 49 | try: |
| 51 | result = subprocess.check_output([python, wafbin, '--version'], cwd=subsrcdir, stderr=subprocess.STDOUT) | 50 | result = subprocess.check_output([python, wafbin, '--version'], cwd=subsrcdir, stderr=subprocess.STDOUT) |
| 52 | version = result.decode('utf-8').split()[1] | 51 | version = result.decode('utf-8').split()[1] |
| 53 | if StrictVersion(version) >= StrictVersion("1.8.7"): | 52 | if bb.utils.vercmp_string_op(version, "1.8.7", ">="): |
| 54 | d.setVar("WAF_EXTRA_CONF", "--bindir=${bindir} --libdir=${libdir}") | 53 | d.setVar("WAF_EXTRA_CONF", "--bindir=${bindir} --libdir=${libdir}") |
| 55 | except subprocess.CalledProcessError as e: | 54 | except subprocess.CalledProcessError as e: |
| 56 | bb.warn("Unable to execute waf --version, exit code %d. Assuming waf version without bindir/libdir support." % e.returncode) | 55 | bb.warn("Unable to execute waf --version, exit code %d. Assuming waf version without bindir/libdir support." % e.returncode) |