diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2013-12-27 21:46:10 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-06 11:13:59 +0000 |
commit | 33b9961ff79fb21e676fdb16cdb8da0988331dab (patch) | |
tree | 99e56e401ebfc4fda2b1734664aa203e7b179fdf /meta/recipes-devtools/make/make-3.82/intermediate-target-bugfix.patch | |
parent | 0cfb1e7a9f8349def5da787d3a284ac6d18ca55d (diff) | |
download | poky-33b9961ff79fb21e676fdb16cdb8da0988331dab.tar.gz |
make: upgrade to 4.0
Upgrade to 4.0, remove the following patches since they have been fixed
by the upgrade:
- expand_MAKEFLAGS.patch
- intermediate-target-bugfix.patch
- make-savannah-bug30612-fix_white_space.patch
- make-savannah-bug30612-handling_of_archives.patch
(From OE-Core rev: f2b40e09e1d9767001f8fd9d5948ff2757491b2f)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/make/make-3.82/intermediate-target-bugfix.patch')
-rw-r--r-- | meta/recipes-devtools/make/make-3.82/intermediate-target-bugfix.patch | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/meta/recipes-devtools/make/make-3.82/intermediate-target-bugfix.patch b/meta/recipes-devtools/make/make-3.82/intermediate-target-bugfix.patch deleted file mode 100644 index b416e64730..0000000000 --- a/meta/recipes-devtools/make/make-3.82/intermediate-target-bugfix.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | Upstream-Status: Backport [The fix is already in upstream git repo, but not in the stable release] | ||
2 | |||
3 | From fbe5b2c9cd612b962836b9391fa2b58c8baed6fc Mon Sep 17 00:00:00 2001 | ||
4 | From: Paul Smith <psmith@gnu.org> | ||
5 | Date: Mon, 10 Sep 2012 02:36:05 +0000 | ||
6 | Subject: Force intermediate targets to be considered if their non-intermediate | ||
7 | |||
8 | parent needs to be remade. Fixes Savannah bug #30653. | ||
9 | --- | ||
10 | diff --git a/remake.c b/remake.c | ||
11 | index c0bf709..b1ddd23 100644 | ||
12 | --- a/remake.c | ||
13 | +++ b/remake.c | ||
14 | @@ -612,6 +612,10 @@ update_file_1 (struct file *file, unsigned int depth) | ||
15 | d->file->dontcare = file->dontcare; | ||
16 | } | ||
17 | |||
18 | + /* We may have already considered this file, when we didn't know | ||
19 | + we'd need to update it. Force update_file() to consider it and | ||
20 | + not prune it. */ | ||
21 | + d->file->considered = !considered; | ||
22 | |||
23 | dep_status |= update_file (d->file, depth); | ||