diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-16 11:52:06 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-16 22:14:12 +0100 |
commit | 14ace86d508a5bdbb8139ce6af09de4d89b44595 (patch) | |
tree | ed3d71953392c8a7c885577b439b3c277976e4c6 /meta/recipes-devtools/gcc/gcc-configure-common.inc | |
parent | 0db15bb0626b16201d0767d87e91c61828a449ef (diff) | |
download | poky-14ace86d508a5bdbb8139ce6af09de4d89b44595.tar.gz |
gcc-configure/gcc-common: Move preconfigure definition to common include
There is a race where:
NOTE: recipe libgcc-initial-4.9.1-r0: task do_configure: Started
NOTE: recipe gcc-runtime-4.9.1-r0: task do_preconfigure: Started
| checking build system type... /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-deb/build/build/tmp/work-shared/gcc-4.9.1-r0/gcc-4.9.1/libgcc/../config.sub: line 1711: syntax error near unexpected token `;;'
| /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-deb/build/build/tmp/work-shared/gcc-4.9.1-r0/gcc-4.9.1/libgcc/../config.sub: line 1711: ` ;;'
| configure: error: /bin/bash /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-deb/build/build/tmp/work-shared/gcc-4.9.1-r0/gcc-4.9.1/libgcc/../config.sub x86_64-linux failed
| WARNING: exit code 2 from a shell command.
so we need to make sure the preconfigure task executes in all shared
work contexts.
(From OE-Core rev: 3c30331d6eaf804b83a6d27189a12efc94310e91)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-configure-common.inc')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-configure-common.inc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc index 48fb7995ca..f33678c75a 100644 --- a/meta/recipes-devtools/gcc/gcc-configure-common.inc +++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc | |||
@@ -93,16 +93,6 @@ _EOF | |||
93 | mv ${B}/gcc/defaults.h.new ${B}/gcc/defaults.h | 93 | mv ${B}/gcc/defaults.h.new ${B}/gcc/defaults.h |
94 | } | 94 | } |
95 | 95 | ||
96 | python do_preconfigure () { | ||
97 | import subprocess | ||
98 | cmd = d.expand('PATH=${PATH} cd ${S} && gnu-configize') | ||
99 | subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True) | ||
100 | # See 0044-gengtypes.patch, we need to regenerate this file | ||
101 | bb.utils.remove(d.expand("${S}/gcc/gengtype-lex.c")) | ||
102 | } | ||
103 | addtask do_preconfigure after do_patch before do_configure | ||
104 | do_preconfigure[depends] += "gnu-config-native:do_populate_sysroot autoconf-native:do_populate_sysroot" | ||
105 | |||
106 | do_configure () { | 96 | do_configure () { |
107 | # Setup these vars for cross building only | 97 | # Setup these vars for cross building only |
108 | # ... because foo_FOR_TARGET apparently gets misinterpreted inside the | 98 | # ... because foo_FOR_TARGET apparently gets misinterpreted inside the |