From: Amanda Brindle <amanda.r.brindle@intel.com>
Date: Thu, 22 Mar 2018 19:12:15 +0000 (-0700)
Subject: waf.bbclass: Throw error if waf doesn't exist
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~18291
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8321dedec7abe392f7e49ff8eee0640463adae5;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

waf.bbclass: Throw error if waf doesn't exist

Before, waf.bbclass would fail to catch FileNotFoundError. Now, it will
catch this error and say that waf doesn't exist.

Fixes [YOCTO 12553]

Signed-off-by: Amanda Brindle <amanda.r.brindle@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/meta/classes/waf.bbclass b/meta/classes/waf.bbclass
index f9a851d0759..19e93761b39 100644
--- a/meta/classes/waf.bbclass
+++ b/meta/classes/waf.bbclass
@@ -15,6 +15,8 @@ python waf_preconfigure() {
             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)
+    except FileNotFoundError:
+        bb.fatal("waf does not exist in %s" % subsrcdir)
 }
 
 do_configure[prefuncs] += "waf_preconfigure"