mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00
Code Issues Projects Releases Wiki Activity

gcc: Fix intermittent failures during configure

Browse Source 
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>
This commit is contained in:
Mark Hatle
2014-11-07 13:21:57 -06:00
committed by Richard Purdie
parent b78e3e3b27
commit 0ee5eb295c
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/gcc/gcc-common.inc
+2
View File
@@ -86,6 +86,8 @@ python do_preconfigure () {
subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True) subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
# See 0044-gengtypes.patch, we need to regenerate this file # See 0044-gengtypes.patch, we need to regenerate this file
bb.utils.remove(d.expand("${S}/gcc/gengtype-lex.c")) 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 addtask do_preconfigure after do_patch before do_configure
do_preconfigure[depends] += "gnu-config-native:do_populate_sysroot autoconf-native:do_populate_sysroot" do_preconfigure[depends] += "gnu-config-native:do_populate_sysroot autoconf-native:do_populate_sysroot"
meta/recipes-devtools/gcc/gcc-cross-canadian.inc
-1
View File
@@ -55,7 +55,6 @@ do_configure () {
export CPPFLAGS_FOR_TARGET="${TARGET_CPPFLAGS}" export CPPFLAGS_FOR_TARGET="${TARGET_CPPFLAGS}"
export CXXFLAGS_FOR_TARGET="${TARGET_CXXFLAGS}" export CXXFLAGS_FOR_TARGET="${TARGET_CXXFLAGS}"
export LDFLAGS_FOR_TARGET="${TARGET_LDFLAGS}" export LDFLAGS_FOR_TARGET="${TARGET_LDFLAGS}"
(cd ${S} && gnu-configize) || die "failure running gnu-configize"
oe_runconf oe_runconf
} }
meta/recipes-devtools/gcc/gcc-cross.inc
-4
View File
@@ -32,10 +32,6 @@ EXTRA_OECONF_PATHS = "\
ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" 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 () { do_compile () {
export CC="${BUILD_CC}" export CC="${BUILD_CC}"
export AR_FOR_TARGET="${TARGET_SYS}-ar" export AR_FOR_TARGET="${TARGET_SYS}-ar"