gcc-configure-common: Address problems with gengtype

PATCH New Richard Purdie 1 participant 1 message Jun 16, 2014

Share & tools

Richard Purdie

author

2014-06-16 12:13 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

meta/recipes-devtools/gcc/gcc-configure-common.inc +2 -0

index 4a10554..75fb379 100644
@@ -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"