diff options
author | Scott Garman <scott.a.garman@intel.com> | 2010-07-13 22:19:46 -0700 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-14 09:52:12 +0100 |
commit | e388cb142a9f79faf528aee6e7d56714f5596450 (patch) | |
tree | a5db949f5340be2e1594a610722267fdef63f6d7 | |
parent | 9522930256e05b5b17dd1473593d9e64db4d7978 (diff) | |
download | poky-e388cb142a9f79faf528aee6e7d56714f5596450.tar.gz |
gcc: Add patch to fix sparseset.o rule
Fix a missing config.h dependency when building sparseset.o to prevent
"conflicting types for 'strsignal'" error, which can intermittently crop
up for high values of make -j.
Thanks to Richard Purdie and Jeff Dike for their help in tracking this
down.
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r-- | meta/packages/gcc/gcc-4.3.3.inc | 1 | ||||
-rw-r--r-- | meta/packages/gcc/gcc-4.3.3/sparseset_rule.patch | 20 | ||||
-rw-r--r-- | meta/packages/gcc/gcc_4.3.3.bb | 2 |
3 files changed, 22 insertions, 1 deletions
diff --git a/meta/packages/gcc/gcc-4.3.3.inc b/meta/packages/gcc/gcc-4.3.3.inc index 5cfa0f68d8..73783e689f 100644 --- a/meta/packages/gcc/gcc-4.3.3.inc +++ b/meta/packages/gcc/gcc-4.3.3.inc | |||
@@ -54,6 +54,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ | |||
54 | file://gcc-flags-for-build.patch;patch=1 \ | 54 | file://gcc-flags-for-build.patch;patch=1 \ |
55 | file://pr35942.patch;patch=1 \ | 55 | file://pr35942.patch;patch=1 \ |
56 | file://optional_libstdc.patch;patch=1 \ | 56 | file://optional_libstdc.patch;patch=1 \ |
57 | file://sparseset_rule.patch;patch=1 \ | ||
57 | " | 58 | " |
58 | 59 | ||
59 | SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " | 60 | SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " |
diff --git a/meta/packages/gcc/gcc-4.3.3/sparseset_rule.patch b/meta/packages/gcc/gcc-4.3.3/sparseset_rule.patch new file mode 100644 index 0000000000..7c8113add1 --- /dev/null +++ b/meta/packages/gcc/gcc-4.3.3/sparseset_rule.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | Fix a missing config.h dependency when building sparseset.o to prevent | ||
2 | "conflicting types for 'strsignal'" error, which can intermittently crop | ||
3 | up for high values of make -j. | ||
4 | |||
5 | Thanks to Richard Purdie and Jeff Dike for their help in tracking this | ||
6 | down. | ||
7 | |||
8 | Scott Garman <scott.a.garman@intel.com> 2010-07-13 | ||
9 | diff -urN gcc-4.3.3.orig//gcc/Makefile.in gcc-4.3.3/gcc/Makefile.in | ||
10 | --- gcc-4.3.3.orig//gcc/Makefile.in 2008-12-04 15:00:19.000000000 -0800 | ||
11 | +++ gcc-4.3.3/gcc/Makefile.in 2010-07-13 21:30:01.864681358 -0700 | ||
12 | @@ -1789,7 +1789,7 @@ | ||
13 | $(FLAGS_H) hard-reg-set.h $(BASIC_BLOCK_H) $(OBSTACK_H) | ||
14 | ebitmap.o: ebitmap.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ | ||
15 | $(EBITMAP_H) | ||
16 | -sparseset.o: sparseset.c $(SYSTEM_H) sparseset.h | ||
17 | +sparseset.o: sparseset.c $(CONFIG_H) $(SYSTEM_H) sparseset.h | ||
18 | |||
19 | COLLECT2_OBJS = collect2.o tlink.o intl.o version.o | ||
20 | COLLECT2_LIBS = @COLLECT2_LIBS@ | ||
diff --git a/meta/packages/gcc/gcc_4.3.3.bb b/meta/packages/gcc/gcc_4.3.3.bb index 7238aed4d7..556fc74267 100644 --- a/meta/packages/gcc/gcc_4.3.3.bb +++ b/meta/packages/gcc/gcc_4.3.3.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | PR = "r6" | 1 | PR = "r7" |
2 | 2 | ||
3 | require gcc-${PV}.inc | 3 | require gcc-${PV}.inc |
4 | require gcc-configure-target.inc | 4 | require gcc-configure-target.inc |