diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-09-03 08:56:52 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-09-03 08:56:52 +0000 |
| commit | e35de7eb3a823920efe3ace11256c5cb8afc122e (patch) | |
| tree | 15b8a38488147971855e2e19310fda28d2faea82 | |
| parent | 11e4e53d6030d91d15b6ce1213167a20c6119703 (diff) | |
| download | poky-e35de7eb3a823920efe3ace11256c5cb8afc122e.tar.gz | |
binutils-2.18: Fix patch
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2669 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/packages/binutils/binutils-2.18/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/meta/packages/binutils/binutils-2.18/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch b/meta/packages/binutils/binutils-2.18/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch index 768f556ad9..8df5b1fea0 100644 --- a/meta/packages/binutils/binutils-2.18/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch +++ b/meta/packages/binutils/binutils-2.18/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch | |||
| @@ -7,26 +7,33 @@ | |||
| 7 | # | 7 | # |
| 8 | #Signed-off-by: John Bowler <jbowler@acm.org> | 8 | #Signed-off-by: John Bowler <jbowler@acm.org> |
| 9 | #Signed-off-by: Bernhard Rosenkraenzer <bero@arklinux.org> | 9 | #Signed-off-by: Bernhard Rosenkraenzer <bero@arklinux.org> |
| 10 | --- binutils-2.18.orig/binutils/objcopy.c | 10 | --- |
| 11 | +++ binutils-2.18/binutils/objcopy.c | 11 | # binutils/objcopy.c | 8 +++++--- |
| 12 | @@ -2787,8 +2787,8 @@ | 12 | # 1 file changed, 5 insertions(+), 3 deletions(-) |
| 13 | # | ||
| 14 | Index: src/binutils/objcopy.c | ||
| 15 | =================================================================== | ||
| 16 | --- src.orig/binutils/objcopy.c 2007-08-09 13:26:03.000000000 +0100 | ||
| 17 | +++ src/binutils/objcopy.c 2007-08-09 16:36:12.000000000 +0100 | ||
| 18 | @@ -2787,8 +2787,9 @@ strip_main (int argc, char *argv[]) | ||
| 13 | if (preserve_dates) | 19 | if (preserve_dates) |
| 14 | set_times (tmpname, &statbuf); | 20 | set_times (tmpname, &statbuf); |
| 15 | if (output_file != tmpname) | 21 | if (output_file != tmpname) |
| 16 | - smart_rename (tmpname, output_file ? output_file : argv[i], | 22 | - smart_rename (tmpname, output_file ? output_file : argv[i], |
| 17 | - preserve_dates); | 23 | - preserve_dates); |
| 18 | + if(smart_rename (tmpname, argv[i], preserve_dates)) | 24 | + if (smart_rename (tmpname, output_file ? output_file : argv[i], |
| 19 | + hold_status = 1; | 25 | + preserve_dates)) |
| 26 | + hold_status = 1; | ||
| 20 | status = hold_status; | 27 | status = hold_status; |
| 21 | } | 28 | } |
| 22 | else | 29 | else |
| 23 | @@ -3411,7 +3411,8 @@ | 30 | @@ -3411,7 +3412,8 @@ copy_main (int argc, char *argv[]) |
| 24 | if (preserve_dates) | 31 | if (preserve_dates) |
| 25 | set_times (tmpname, &statbuf); | 32 | set_times (tmpname, &statbuf); |
| 26 | if (tmpname != output_filename) | 33 | if (tmpname != output_filename) |
| 27 | - smart_rename (tmpname, input_filename, preserve_dates); | 34 | - smart_rename (tmpname, input_filename, preserve_dates); |
| 28 | + if (smart_rename (tmpname, input_filename, preserve_dates)) | 35 | + if (smart_rename (tmpname, input_filename, preserve_dates)) |
| 29 | + status = 1; | 36 | + status = 1; |
| 30 | } | 37 | } |
| 31 | else | 38 | else |
| 32 | unlink_if_ordinary (tmpname); | 39 | unlink_if_ordinary (tmpname); |