gcc-configure-common: Address problems with gengtype

Submitted by Richard Purdie on June 16, 2014, 12:13 p.m. | Patch ID: 73871


Message ID 1402920818.562.64.camel@ted
State Accepted
Commit dd649374b30eb2d9980dce6eae95db0563593ef7
Headers show

Commit Message

Richard Purdie June 16, 2014, 12:13 p.m.
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

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>

Patch hide | download patch | download mbox

diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index 4a10554..75fb379 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"