From 6317df47791e1e35b78dc69a636445dbc22d5c21 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Mon, 28 Jul 2008 21:32:33 +0000 Subject: Fourth step at renaming patches: renumber all patches with a 10-step. --- .../2.18.50.0.4/110-ld-makefile-path.patch | 30 ++++++++++++++++++++++ .../2.18.50.0.4/120-check-ldrunpath-length.patch | 26 +++++++++++++++++++ .../2.18.50.0.4/200-ld-makefile-path.patch | 30 ---------------------- .../2.18.50.0.4/300-check-ldrunpath-length.patch | 26 ------------------- 4 files changed, 56 insertions(+), 56 deletions(-) create mode 100644 patches/binutils/2.18.50.0.4/110-ld-makefile-path.patch create mode 100644 patches/binutils/2.18.50.0.4/120-check-ldrunpath-length.patch delete mode 100644 patches/binutils/2.18.50.0.4/200-ld-makefile-path.patch delete mode 100644 patches/binutils/2.18.50.0.4/300-check-ldrunpath-length.patch (limited to 'patches/binutils/2.18.50.0.4') diff --git a/patches/binutils/2.18.50.0.4/110-ld-makefile-path.patch b/patches/binutils/2.18.50.0.4/110-ld-makefile-path.patch new file mode 100644 index 00000000..9eea2a1b --- /dev/null +++ b/patches/binutils/2.18.50.0.4/110-ld-makefile-path.patch @@ -0,0 +1,30 @@ +Fix ld scripts path, copied from buildroot. + + binutils-2.18.50.0.6/ld/Makefile.am | 2 1 1 0 +- + binutils-2.18.50.0.6/ld/Makefile.in | 2 1 1 0 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff -durN binutils-2.18.50.0.6.orig/ld/Makefile.am binutils-2.18.50.0.6/ld/Makefile.am +--- binutils-2.18.50.0.6.orig/ld/Makefile.am 2008-04-03 18:54:05.000000000 +0200 ++++ binutils-2.18.50.0.6/ld/Makefile.am 2008-05-02 23:25:14.000000000 +0200 +@@ -18,7 +18,7 @@ + # We put the scripts in the directory $(scriptdir)/ldscripts. + # We can't put the scripts in $(datadir) because the SEARCH_DIR + # directives need to be different for native and cross linkers. +-scriptdir = $(tooldir)/lib ++scriptdir = $(libdir) + + EMUL = @EMUL@ + EMULATION_OFILES = @EMULATION_OFILES@ +diff -durN binutils-2.18.50.0.6.orig/ld/Makefile.in binutils-2.18.50.0.6/ld/Makefile.in +--- binutils-2.18.50.0.6.orig/ld/Makefile.in 2008-04-03 18:54:05.000000000 +0200 ++++ binutils-2.18.50.0.6/ld/Makefile.in 2008-05-02 23:25:14.000000000 +0200 +@@ -288,7 +288,7 @@ + # We put the scripts in the directory $(scriptdir)/ldscripts. + # We can't put the scripts in $(datadir) because the SEARCH_DIR + # directives need to be different for native and cross linkers. +-scriptdir = $(tooldir)/lib ++scriptdir = $(libdir) + BASEDIR = $(srcdir)/.. + BFDDIR = $(BASEDIR)/bfd + INCDIR = $(BASEDIR)/include diff --git a/patches/binutils/2.18.50.0.4/120-check-ldrunpath-length.patch b/patches/binutils/2.18.50.0.4/120-check-ldrunpath-length.patch new file mode 100644 index 00000000..7b3e7e15 --- /dev/null +++ b/patches/binutils/2.18.50.0.4/120-check-ldrunpath-length.patch @@ -0,0 +1,26 @@ +Check LD_RUN_PATH length, copied from buildroot. + + binutils-2.18.50.0.6/ld/emultempl/elf32.em | 4 4 0 0 ++++ + 1 file changed, 4 insertions(+) + +diff -durN binutils-2.18.50.0.6.orig/ld/emultempl/elf32.em binutils-2.18.50.0.6/ld/emultempl/elf32.em +--- binutils-2.18.50.0.6.orig/ld/emultempl/elf32.em 2008-04-03 18:54:25.000000000 +0200 ++++ binutils-2.18.50.0.6/ld/emultempl/elf32.em 2008-05-02 23:30:08.000000000 +0200 +@@ -1220,6 +1220,8 @@ + && command_line.rpath == NULL) + { + lib_path = (const char *) getenv ("LD_RUN_PATH"); ++ if ((lib_path) && (strlen (lib_path) == 0)) ++ lib_path = NULL; + if (gld${EMULATION_NAME}_search_needed (lib_path, &n, + force)) + break; +@@ -1405,6 +1407,8 @@ + rpath = command_line.rpath; + if (rpath == NULL) + rpath = (const char *) getenv ("LD_RUN_PATH"); ++ if ((rpath) && (strlen (rpath) == 0)) ++ rpath = NULL; + if (! (bfd_elf_size_dynamic_sections + (link_info.output_bfd, command_line.soname, rpath, + command_line.filter_shlib, diff --git a/patches/binutils/2.18.50.0.4/200-ld-makefile-path.patch b/patches/binutils/2.18.50.0.4/200-ld-makefile-path.patch deleted file mode 100644 index 9eea2a1b..00000000 --- a/patches/binutils/2.18.50.0.4/200-ld-makefile-path.patch +++ /dev/null @@ -1,30 +0,0 @@ -Fix ld scripts path, copied from buildroot. - - binutils-2.18.50.0.6/ld/Makefile.am | 2 1 1 0 +- - binutils-2.18.50.0.6/ld/Makefile.in | 2 1 1 0 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff -durN binutils-2.18.50.0.6.orig/ld/Makefile.am binutils-2.18.50.0.6/ld/Makefile.am ---- binutils-2.18.50.0.6.orig/ld/Makefile.am 2008-04-03 18:54:05.000000000 +0200 -+++ binutils-2.18.50.0.6/ld/Makefile.am 2008-05-02 23:25:14.000000000 +0200 -@@ -18,7 +18,7 @@ - # We put the scripts in the directory $(scriptdir)/ldscripts. - # We can't put the scripts in $(datadir) because the SEARCH_DIR - # directives need to be different for native and cross linkers. --scriptdir = $(tooldir)/lib -+scriptdir = $(libdir) - - EMUL = @EMUL@ - EMULATION_OFILES = @EMULATION_OFILES@ -diff -durN binutils-2.18.50.0.6.orig/ld/Makefile.in binutils-2.18.50.0.6/ld/Makefile.in ---- binutils-2.18.50.0.6.orig/ld/Makefile.in 2008-04-03 18:54:05.000000000 +0200 -+++ binutils-2.18.50.0.6/ld/Makefile.in 2008-05-02 23:25:14.000000000 +0200 -@@ -288,7 +288,7 @@ - # We put the scripts in the directory $(scriptdir)/ldscripts. - # We can't put the scripts in $(datadir) because the SEARCH_DIR - # directives need to be different for native and cross linkers. --scriptdir = $(tooldir)/lib -+scriptdir = $(libdir) - BASEDIR = $(srcdir)/.. - BFDDIR = $(BASEDIR)/bfd - INCDIR = $(BASEDIR)/include diff --git a/patches/binutils/2.18.50.0.4/300-check-ldrunpath-length.patch b/patches/binutils/2.18.50.0.4/300-check-ldrunpath-length.patch deleted file mode 100644 index 7b3e7e15..00000000 --- a/patches/binutils/2.18.50.0.4/300-check-ldrunpath-length.patch +++ /dev/null @@ -1,26 +0,0 @@ -Check LD_RUN_PATH length, copied from buildroot. - - binutils-2.18.50.0.6/ld/emultempl/elf32.em | 4 4 0 0 ++++ - 1 file changed, 4 insertions(+) - -diff -durN binutils-2.18.50.0.6.orig/ld/emultempl/elf32.em binutils-2.18.50.0.6/ld/emultempl/elf32.em ---- binutils-2.18.50.0.6.orig/ld/emultempl/elf32.em 2008-04-03 18:54:25.000000000 +0200 -+++ binutils-2.18.50.0.6/ld/emultempl/elf32.em 2008-05-02 23:30:08.000000000 +0200 -@@ -1220,6 +1220,8 @@ - && command_line.rpath == NULL) - { - lib_path = (const char *) getenv ("LD_RUN_PATH"); -+ if ((lib_path) && (strlen (lib_path) == 0)) -+ lib_path = NULL; - if (gld${EMULATION_NAME}_search_needed (lib_path, &n, - force)) - break; -@@ -1405,6 +1407,8 @@ - rpath = command_line.rpath; - if (rpath == NULL) - rpath = (const char *) getenv ("LD_RUN_PATH"); -+ if ((rpath) && (strlen (rpath) == 0)) -+ rpath = NULL; - if (! (bfd_elf_size_dynamic_sections - (link_info.output_bfd, command_line.soname, rpath, - command_line.filter_shlib, -- cgit v1.2.3