mirror of
https://git.yoctoproject.org/poky
synced 2026-04-29 00:32:14 +02:00
insane: wrap autotools checks in inherits_class(autotools) checks
There's no point doing the autotools sanity checks if a recipe didn't inherit autotools, so check the inherits before doing the checks. Also pass -F (fixed strings) and -q (quiet) to grep. (From OE-Core rev: 75ae572427d9cd3f0b3e9e7d4d0e7a93a4f04690) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
35011d9ac6
commit
f770a6e0c2
@@ -1148,19 +1148,21 @@ python do_qa_configure() {
|
||||
|
||||
configs = []
|
||||
workdir = d.getVar('WORKDIR', True)
|
||||
bb.note("Checking autotools environment for common misconfiguration")
|
||||
for root, dirs, files in os.walk(workdir):
|
||||
statement = "grep -e 'CROSS COMPILE Badness:' -e 'is unsafe for cross-compilation' %s > /dev/null" % \
|
||||
os.path.join(root,"config.log")
|
||||
if "config.log" in files:
|
||||
if subprocess.call(statement, shell=True) == 0:
|
||||
bb.fatal("""This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities.
|
||||
|
||||
if bb.data.inherits_class('autotools', d):
|
||||
bb.note("Checking autotools environment for common misconfiguration")
|
||||
for root, dirs, files in os.walk(workdir):
|
||||
statement = "grep -q -F -e 'CROSS COMPILE Badness:' -e 'is unsafe for cross-compilation' %s" % \
|
||||
os.path.join(root,"config.log")
|
||||
if "config.log" in files:
|
||||
if subprocess.call(statement, shell=True) == 0:
|
||||
bb.fatal("""This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities.
|
||||
Rerun configure task after fixing this.""")
|
||||
|
||||
if "configure.ac" in files:
|
||||
configs.append(os.path.join(root,"configure.ac"))
|
||||
if "configure.in" in files:
|
||||
configs.append(os.path.join(root, "configure.in"))
|
||||
if "configure.ac" in files:
|
||||
configs.append(os.path.join(root,"configure.ac"))
|
||||
if "configure.in" in files:
|
||||
configs.append(os.path.join(root, "configure.in"))
|
||||
|
||||
###########################################################################
|
||||
# Check gettext configuration and dependencies are correct
|
||||
|
||||
Reference in New Issue
Block a user