git-svn-id: https://svn.pengutronix.de/svn/oselas/toolchain/branches/OSELAS.Toolchain-mkl@6262 f8d472c7-5700-0410-ac5a-87979cec3adf

3 files changed, 31 insertions, 17 deletions

diff --git a/patches/binutils-2.18/generic/gentoo/07_all_binutils-2.18-windres.patch b/patches/binutils-2.18/generic/gentoo/07_all_binutils-2.18-windres.patch
index 5c2fbcd..476aefd 100644
--- a/patches/binutils-2.18/generic/gentoo/07_all_binutils-2.18-windres.patch
+++ b/patches/binutils-2.18/generic/gentoo/07_all_binutils-2.18-windres.patch
@@ -1,6 +1,12 @@
 http://sourceware.org/bugzilla/show_bug.cgi?id=4987
 
---- binutils-2.18/binutils/resrc.c
+---
+ binutils/resrc.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: binutils-2.18/binutils/resrc.c
+===================================================================
+--- binutils-2.18.orig/binutils/resrc.c
 +++ binutils-2.18/binutils/resrc.c
 @@ -437,7 +437,7 @@ read_rc_file (const char *filename, cons
    const char *fnquotes = (filename_need_quotes (filename) ? "\"" : "");
diff --git a/patches/binutils-2.18/generic/gentoo/18_all_binutils-makeinfo-version.patch b/patches/binutils-2.18/generic/gentoo/18_all_binutils-makeinfo-version.patch
index 6f3ce83..04a2eb2 100644
--- a/patches/binutils-2.18/generic/gentoo/18_all_binutils-makeinfo-version.patch
+++ b/patches/binutils-2.18/generic/gentoo/18_all_binutils-makeinfo-version.patch
@@ -5,15 +5,16 @@ http://bugs.gentoo.org/195074
 	* configure.ac: Correct makeinfo version check.
 	* configure: Regenerate.
 
-Index: configure.ac
+---
+ configure    |    2 +-
+ configure.ac |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: binutils-2.18/configure.ac
 ===================================================================
-RCS file: /cvs/src/src/configure.ac,v
-retrieving revision 1.25
-retrieving revision 1.26
-diff -u -p -r1.25 -r1.26
---- configure.ac	14 Sep 2007 14:51:36 -0000	1.25
-+++ configure.ac	14 Sep 2007 15:47:01 -0000	1.26
-@@ -2462,7 +2462,7 @@ changequote(,)
+--- binutils-2.18.orig/configure.ac
++++ binutils-2.18/configure.ac
+@@ -2403,7 +2403,7 @@ changequote(,)
      # For an installed makeinfo, we require it to be from texinfo 4.4 or
      # higher, else we use the "missing" dummy.
      if ${MAKEINFO} --version \
@@ -22,9 +23,11 @@ diff -u -p -r1.25 -r1.26
        :
      else
        MAKEINFO="$MISSING makeinfo"
---- configure
-+++ configure
-@@ -2462,7 +2462,7 @@ changequote(,)
+Index: binutils-2.18/configure
+===================================================================
+--- binutils-2.18.orig/configure
++++ binutils-2.18/configure
+@@ -6128,7 +6128,7 @@ case " $build_configdirs " in
      # For an installed makeinfo, we require it to be from texinfo 4.4 or
      # higher, else we use the "missing" dummy.
      if ${MAKEINFO} --version \
diff --git a/patches/binutils-2.18/generic/gentoo/42_all_012_check_ldrunpath_length.patch b/patches/binutils-2.18/generic/gentoo/42_all_012_check_ldrunpath_length.patch
index 498651a..e03eca8 100644
--- a/patches/binutils-2.18/generic/gentoo/42_all_012_check_ldrunpath_length.patch
+++ b/patches/binutils-2.18/generic/gentoo/42_all_012_check_ldrunpath_length.patch
@@ -24,10 +24,15 @@ 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 @@
+---
+ ld/emultempl/elf32.em |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+Index: binutils-2.18/ld/emultempl/elf32.em
+===================================================================
+--- binutils-2.18.orig/ld/emultempl/elf32.em
++++ binutils-2.18/ld/emultempl/elf32.em
+@@ -1216,6 +1216,8 @@ fragment <<EOF
  	      && command_line.rpath == NULL)
  	    {
  	      lib_path = (const char *) getenv ("LD_RUN_PATH");
@@ -36,7 +41,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 @@
+@@ -1400,6 +1402,8 @@ gld${EMULATION_NAME}_before_allocation (
    rpath = command_line.rpath;
    if (rpath == NULL)
      rpath = (const char *) getenv ("LD_RUN_PATH");