From 0ee5eb295c89a797fc505fc3cca2bbc5ff88fff0 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 7 Nov 2014 13:21:57 -0600 Subject: gcc: Fix intermittent failures during configure If configure or any of the components it uses from the shared work directory change, do_configure may fail. An existing do_preconfigure was created to handle these conditions, but a 'sed' operation was missed, and a call to gnu-configize was also missed. (From OE-Core rev: 21c2cfff14442cf224e3568bdbb9bcd4070be247) Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-common.inc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta/recipes-devtools/gcc/gcc-common.inc') diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc index 0bf26b5c62..9d41f651ed 100644 --- a/meta/recipes-devtools/gcc/gcc-common.inc +++ b/meta/recipes-devtools/gcc/gcc-common.inc @@ -86,6 +86,8 @@ python do_preconfigure () { 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")) + cmd = d.expand("sed -i 's/BUILD_INFO=info/BUILD_INFO=/' ${S}/gcc/configure") + subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True) } addtask do_preconfigure after do_patch before do_configure do_preconfigure[depends] += "gnu-config-native:do_populate_sysroot autoconf-native:do_populate_sysroot" -- cgit v1.2.3-54-g00ecf