diff options
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch')
-rw-r--r-- | meta/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/meta/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch index 8f0a40210f..28a17f3865 100644 --- a/meta/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch +++ b/meta/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From c008c7f97c1cf487749c6c375820a1f3b3c6c53d Mon Sep 17 00:00:00 2001 | 1 | From 4ff83779de8621715c6c2a79cf7ed8d74ff2d7c5 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 2 Mar 2015 01:27:17 +0000 | 3 | Date: Mon, 2 Mar 2015 01:27:17 +0000 |
4 | Subject: [PATCH 04/14] Only generate an RPATH entry if LD_RUN_PATH is not | 4 | Subject: [PATCH 04/13] Only generate an RPATH entry if LD_RUN_PATH is not |
5 | empty | 5 | empty |
6 | 6 | ||
7 | for cases where -rpath isn't specified. debian (#151024) | 7 | for cases where -rpath isn't specified. debian (#151024) |
@@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
15 | 1 file changed, 4 insertions(+) | 15 | 1 file changed, 4 insertions(+) |
16 | 16 | ||
17 | diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em | 17 | diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em |
18 | index 0405d4f..73c5447 100644 | 18 | index 47fa549..f4c640e 100644 |
19 | --- a/ld/emultempl/elf32.em | 19 | --- a/ld/emultempl/elf32.em |
20 | +++ b/ld/emultempl/elf32.em | 20 | +++ b/ld/emultempl/elf32.em |
21 | @@ -1242,6 +1242,8 @@ fragment <<EOF | 21 | @@ -1244,6 +1244,8 @@ fragment <<EOF |
22 | && command_line.rpath == NULL) | 22 | && command_line.rpath == NULL) |
23 | { | 23 | { |
24 | lib_path = (const char *) getenv ("LD_RUN_PATH"); | 24 | lib_path = (const char *) getenv ("LD_RUN_PATH"); |
@@ -27,7 +27,7 @@ index 0405d4f..73c5447 100644 | |||
27 | if (gld${EMULATION_NAME}_search_needed (lib_path, &n, | 27 | if (gld${EMULATION_NAME}_search_needed (lib_path, &n, |
28 | force)) | 28 | force)) |
29 | break; | 29 | break; |
30 | @@ -1523,6 +1525,8 @@ gld${EMULATION_NAME}_before_allocation (void) | 30 | @@ -1525,6 +1527,8 @@ gld${EMULATION_NAME}_before_allocation (void) |
31 | rpath = command_line.rpath; | 31 | rpath = command_line.rpath; |
32 | if (rpath == NULL) | 32 | if (rpath == NULL) |
33 | rpath = (const char *) getenv ("LD_RUN_PATH"); | 33 | rpath = (const char *) getenv ("LD_RUN_PATH"); |
@@ -37,5 +37,5 @@ index 0405d4f..73c5447 100644 | |||
37 | for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) | 37 | for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) |
38 | if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) | 38 | if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) |
39 | -- | 39 | -- |
40 | 2.7.1 | 40 | 2.9.0 |
41 | 41 | ||