summaryrefslogtreecommitdiff
path: root/patches/binutils/2.20/140-check_ldrunpath_length.patch
diff options
context:
space:
mode:
authorFrederic Roussel <fr.frasc@gmail.com>2009-11-11 22:44:53 (GMT)
committerFrederic Roussel" <fr.frasc@gmail.com>2009-11-11 22:44:53 (GMT)
commit6c882486475e1253c5143134207edd816f44afbb (patch)
tree2efa2947bd8e3adbb9ac5395b1302274854dafa0 /patches/binutils/2.20/140-check_ldrunpath_length.patch
parent6af0ca415345ae40815a23dcac1077f27f2b2a95 (diff)
patches/binutils/2.20: make patches appliable
Fix filenames in patch files for binutils-2.20. Some patch files were only usable with patch argument '-p0'. Fix the diff context to match 2.20 release. Signed-off-by: Frederic Roussel <fr.frasc@gmail.com>
Diffstat (limited to 'patches/binutils/2.20/140-check_ldrunpath_length.patch')
-rw-r--r--patches/binutils/2.20/140-check_ldrunpath_length.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/binutils/2.20/140-check_ldrunpath_length.patch b/patches/binutils/2.20/140-check_ldrunpath_length.patch
index 498651a..fce6ae1 100644
--- a/patches/binutils/2.20/140-check_ldrunpath_length.patch
+++ b/patches/binutils/2.20/140-check_ldrunpath_length.patch
@@ -26,7 +26,7 @@ exit 0
@DPATCH@
diff -urNad /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em binutils-2.15/ld/emultempl/elf32.em
--- /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em 2004-05-21 23:12:58.000000000 +0100
-+++ binutils-2.15/ld/emultempl/elf32.em 2004-05-21 23:12:59.000000000 +0100
++++ binutils-2.20/ld/emultempl/elf32.em 2004-05-21 23:12:59.000000000 +0100
@@ -692,6 +692,8 @@
&& command_line.rpath == NULL)
{
@@ -43,5 +43,5 @@ diff -urNad /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/
+ if ((rpath) && (strlen (rpath) == 0))
+ rpath = NULL;
if (! (bfd_elf_size_dynamic_sections
- (output_bfd, command_line.soname, rpath,
+ (link_info.output_bfd, command_line.soname, rpath,
command_line.filter_shlib,