From dd649374b30eb2d9980dce6eae95db0563593ef7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 16 Jun 2014 13:13:38 +0100 Subject: 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 --- meta/recipes-devtools/gcc/gcc-configure-common.inc | 2 ++ 1 file changed, 2 insertions(+) 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" -- cgit 1.2.3-korg