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:59:03 +0100
commit79a3a77680e35ecbb23c93115b15208b22766fee (patch)
treea1331bda32fb2cc120e4a8fb134a4c70d9d80c4e
parentc56c9a2f41eac8f87f13547806edc794b77ba54e (diff)
downloadpoky-79a3a77680e35ecbb23c93115b15208b22766fee.tar.gz
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] (From OE-Core rev: dd649374b30eb2d9980dce6eae95db0563593ef7) 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 () {
91 import subprocess 91 import subprocess
92 cmd = d.expand('PATH=${PATH} cd ${S} && gnu-configize') 92 cmd = d.expand('PATH=${PATH} cd ${S} && gnu-configize')
93 subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True) 93 subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
94 # See 0044-gengtypes.patch, we need to regenerate this file
95 bb.utils.remove(d.expand("${S}/gcc/gengtype-lex.c"))
94} 96}
95addtask do_preconfigure after do_patch before do_configure 97addtask do_preconfigure after do_patch before do_configure
96do_preconfigure[depends] += "gnu-config-native:do_populate_sysroot autoconf-native:do_populate_sysroot" 98do_preconfigure[depends] += "gnu-config-native:do_populate_sysroot autoconf-native:do_populate_sysroot"