summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2014-11-07 13:21:57 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-09 10:21:20 +0000
commit0ee5eb295c89a797fc505fc3cca2bbc5ff88fff0 (patch)
tree4d62dd0700a79761ae0481976d734076610b4ece /meta/recipes-devtools
parentb78e3e3b27a2e92acfb2c7d7d9f8779c60b2c6dc (diff)
downloadpoky-0ee5eb295c89a797fc505fc3cca2bbc5ff88fff0.tar.gz
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 <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/gcc/gcc-common.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-canadian.inc1
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross.inc4
3 files changed, 2 insertions, 5 deletions
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 () {
86 subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True) 86 subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
87 # See 0044-gengtypes.patch, we need to regenerate this file 87 # See 0044-gengtypes.patch, we need to regenerate this file
88 bb.utils.remove(d.expand("${S}/gcc/gengtype-lex.c")) 88 bb.utils.remove(d.expand("${S}/gcc/gengtype-lex.c"))
89 cmd = d.expand("sed -i 's/BUILD_INFO=info/BUILD_INFO=/' ${S}/gcc/configure")
90 subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
89} 91}
90addtask do_preconfigure after do_patch before do_configure 92addtask do_preconfigure after do_patch before do_configure
91do_preconfigure[depends] += "gnu-config-native:do_populate_sysroot autoconf-native:do_populate_sysroot" 93do_preconfigure[depends] += "gnu-config-native:do_populate_sysroot autoconf-native:do_populate_sysroot"
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
index 1a63f82722..0f79533771 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
@@ -55,7 +55,6 @@ do_configure () {
55 export CPPFLAGS_FOR_TARGET="${TARGET_CPPFLAGS}" 55 export CPPFLAGS_FOR_TARGET="${TARGET_CPPFLAGS}"
56 export CXXFLAGS_FOR_TARGET="${TARGET_CXXFLAGS}" 56 export CXXFLAGS_FOR_TARGET="${TARGET_CXXFLAGS}"
57 export LDFLAGS_FOR_TARGET="${TARGET_LDFLAGS}" 57 export LDFLAGS_FOR_TARGET="${TARGET_LDFLAGS}"
58 (cd ${S} && gnu-configize) || die "failure running gnu-configize"
59 oe_runconf 58 oe_runconf
60} 59}
61 60
diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc
index 9147acd1a8..97929501e8 100644
--- a/meta/recipes-devtools/gcc/gcc-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross.inc
@@ -32,10 +32,6 @@ EXTRA_OECONF_PATHS = "\
32 32
33ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" 33ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
34 34
35do_configure_prepend () {
36 sed -i 's/BUILD_INFO=info/BUILD_INFO=/' ${S}/gcc/configure
37}
38
39do_compile () { 35do_compile () {
40 export CC="${BUILD_CC}" 36 export CC="${BUILD_CC}"
41 export AR_FOR_TARGET="${TARGET_SYS}-ar" 37 export AR_FOR_TARGET="${TARGET_SYS}-ar"