mirror of
https://git.yoctoproject.org/poky
synced 2026-09-14 21:49:33 +02:00
binutils-2.18: Fix patch
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2669 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
@@ -7,26 +7,33 @@
|
|||||||
#
|
#
|
||||||
#Signed-off-by: John Bowler <jbowler@acm.org>
|
#Signed-off-by: John Bowler <jbowler@acm.org>
|
||||||
#Signed-off-by: Bernhard Rosenkraenzer <bero@arklinux.org>
|
#Signed-off-by: Bernhard Rosenkraenzer <bero@arklinux.org>
|
||||||
--- binutils-2.18.orig/binutils/objcopy.c
|
---
|
||||||
+++ binutils-2.18/binutils/objcopy.c
|
# binutils/objcopy.c | 8 +++++---
|
||||||
@@ -2787,8 +2787,8 @@
|
# 1 file changed, 5 insertions(+), 3 deletions(-)
|
||||||
|
#
|
||||||
|
Index: src/binutils/objcopy.c
|
||||||
|
===================================================================
|
||||||
|
--- src.orig/binutils/objcopy.c 2007-08-09 13:26:03.000000000 +0100
|
||||||
|
+++ src/binutils/objcopy.c 2007-08-09 16:36:12.000000000 +0100
|
||||||
|
@@ -2787,8 +2787,9 @@ strip_main (int argc, char *argv[])
|
||||||
if (preserve_dates)
|
if (preserve_dates)
|
||||||
set_times (tmpname, &statbuf);
|
set_times (tmpname, &statbuf);
|
||||||
if (output_file != tmpname)
|
if (output_file != tmpname)
|
||||||
- smart_rename (tmpname, output_file ? output_file : argv[i],
|
- smart_rename (tmpname, output_file ? output_file : argv[i],
|
||||||
- preserve_dates);
|
- preserve_dates);
|
||||||
+ if(smart_rename (tmpname, argv[i], preserve_dates))
|
+ if (smart_rename (tmpname, output_file ? output_file : argv[i],
|
||||||
+ hold_status = 1;
|
+ preserve_dates))
|
||||||
|
+ hold_status = 1;
|
||||||
status = hold_status;
|
status = hold_status;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -3411,7 +3411,8 @@
|
@@ -3411,7 +3412,8 @@ copy_main (int argc, char *argv[])
|
||||||
if (preserve_dates)
|
if (preserve_dates)
|
||||||
set_times (tmpname, &statbuf);
|
set_times (tmpname, &statbuf);
|
||||||
if (tmpname != output_filename)
|
if (tmpname != output_filename)
|
||||||
- smart_rename (tmpname, input_filename, preserve_dates);
|
- smart_rename (tmpname, input_filename, preserve_dates);
|
||||||
+ if (smart_rename (tmpname, input_filename, preserve_dates))
|
+ if (smart_rename (tmpname, input_filename, preserve_dates))
|
||||||
+ status = 1;
|
+ status = 1;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
unlink_if_ordinary (tmpname);
|
unlink_if_ordinary (tmpname);
|
||||||
|
|||||||
Reference in New Issue
Block a user