summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-16 13:13:38 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-17 08:56:09 +0100
commitdd649374b30eb2d9980dce6eae95db0563593ef7 (patch)
tree64a8f8aeb04f5914083692b1304efc0fbdcd67da
parent6f8b5be646be0f3e15e215907547f11d2a23d81b (diff)
downloadopenembedded-core-contrib-dd649374b30eb2d9980dce6eae95db0563593ef7.tar.gz
openembedded-core-contrib-dd649374b30eb2d9980dce6eae95db0563593ef7.tar.bz2
openembedded-core-contrib-dd649374b30eb2d9980dce6eae95db0563593ef7.zip
gcc-configure-common: Address problems with gengtype
The gengtype patch we apply to gcc aims to ensure that the build and host config headers don't get confused. We're seeing build failures where both headers have been included, likely due to a race over the configuration files. It seems the gengtype-lex.c file isn't being regenerated when it should and the unconditional inclusion of bconfig.h is resulting in these issues. The fix is therefore to remove the file, forcing its regeneration. [YOCTO #6393] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-common.inc2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index 4a105540fa..75fb379956 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
@@ -91,6 +91,8 @@ python do_preconfigure () {
import subprocess
cmd = d.expand('PATH=${PATH} cd ${S} && gnu-configize')
subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
+ # See 0044-gengtypes.patch, we need to regenerate this file
+ bb.utils.remove(d.expand("${S}/gcc/gengtype-lex.c"))
}
addtask do_preconfigure after do_patch before do_configure
do_preconfigure[depends] += "gnu-config-native:do_populate_sysroot autoconf-native:do_populate_sysroot"