aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain/binutils/patches/2.17/300-012_check_ldrunpath_length.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-06-28 07:20:42 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-06-28 07:20:42 +0000
commit7170cf7ed0f2bb15ea7dfc17cb9a7008793f0697 (patch)
tree37127848db5503c73fc77a84045db18180fa08a5 /toolchain/binutils/patches/2.17/300-012_check_ldrunpath_length.patch
parent587fc039792981042611549257cec663d961febf (diff)
downloadupstream-7170cf7ed0f2bb15ea7dfc17cb9a7008793f0697.tar.gz
upstream-7170cf7ed0f2bb15ea7dfc17cb9a7008793f0697.tar.bz2
upstream-7170cf7ed0f2bb15ea7dfc17cb9a7008793f0697.zip
remove the custom Build/Prepare override in binutils, use PATCH_DIR, refresh patches using quilt
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7752 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/binutils/patches/2.17/300-012_check_ldrunpath_length.patch')
-rw-r--r--toolchain/binutils/patches/2.17/300-012_check_ldrunpath_length.patch11
1 files changed, 6 insertions, 5 deletions
diff --git a/toolchain/binutils/patches/2.17/300-012_check_ldrunpath_length.patch b/toolchain/binutils/patches/2.17/300-012_check_ldrunpath_length.patch
index 498651a90c..c47bcca136 100644
--- a/toolchain/binutils/patches/2.17/300-012_check_ldrunpath_length.patch
+++ b/toolchain/binutils/patches/2.17/300-012_check_ldrunpath_length.patch
@@ -24,10 +24,11 @@ esac
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
-@@ -692,6 +692,8 @@
+Index: binutils-2.17/ld/emultempl/elf32.em
+===================================================================
+--- binutils-2.17.orig/ld/emultempl/elf32.em 2007-06-28 09:19:34.796946512 +0200
++++ binutils-2.17/ld/emultempl/elf32.em 2007-06-28 09:19:36.178736448 +0200
+@@ -970,6 +970,8 @@
&& command_line.rpath == NULL)
{
lib_path = (const char *) getenv ("LD_RUN_PATH");
@@ -36,7 +37,7 @@ diff -urNad /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/
if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
force))
break;
-@@ -871,6 +873,8 @@
+@@ -1154,6 +1156,8 @@
rpath = command_line.rpath;
if (rpath == NULL)
rpath = (const char *) getenv ("LD_RUN_PATH");