diff options
| author | Mark Hatle <mark.hatle@windriver.com> | 2014-11-07 13:21:57 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-31 10:17:15 +0000 |
| commit | cb7548feaeb07eca4855223ff2fa6676882b6424 (patch) | |
| tree | 64ad7c20f99bb543b5e3329f799dd2b1f4d46d8b /meta/recipes-devtools/gcc | |
| parent | 326590db7067660af6c896a130c793cd1b55f650 (diff) | |
| download | openembedded-core-cb7548feaeb07eca4855223ff2fa6676882b6424.tar.gz openembedded-core-cb7548feaeb07eca4855223ff2fa6676882b6424.tar.bz2 openembedded-core-cb7548feaeb07eca4855223ff2fa6676882b6424.zip | |
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>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta/recipes-devtools/gcc')
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-common.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-cross.inc | 4 |
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 () { 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" diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc index 0b1f37b908..ba001a9118 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 () { export CPPFLAGS_FOR_TARGET="${TARGET_CPPFLAGS}" export CXXFLAGS_FOR_TARGET="${TARGET_CXXFLAGS}" export LDFLAGS_FOR_TARGET="${TARGET_LDFLAGS}" - (cd ${S} && gnu-configize) || die "failure running gnu-configize" oe_runconf } diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc index 4cdb55f3ee..4cae160e78 100644 --- a/meta/recipes-devtools/gcc/gcc-cross.inc +++ b/meta/recipes-devtools/gcc/gcc-cross.inc @@ -32,10 +32,6 @@ EXTRA_OECONF_PATHS = "\ ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" -do_configure_prepend () { - sed -i 's/BUILD_INFO=info/BUILD_INFO=/' ${S}/gcc/configure -} - do_compile () { export CC="${BUILD_CC}" export AR_FOR_TARGET="${TARGET_SYS}-ar" |