diff options
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch')
-rw-r--r-- | meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch index d920729204..654b64ff78 100644 --- a/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch +++ b/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch | |||
@@ -1,7 +1,8 @@ | |||
1 | From 13791636abf518f0db209dc51c29445d80421f2e Mon Sep 17 00:00:00 2001 | 1 | From 59640ddf11104a604ccf7c078a48359d711c2f9c 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] Only generate an RPATH entry if LD_RUN_PATH is not empty | 4 | Subject: [PATCH 06/17] Only generate an RPATH entry if LD_RUN_PATH is not |
5 | empty | ||
5 | 6 | ||
6 | for cases where -rpath isn't specified. debian (#151024) | 7 | for cases where -rpath isn't specified. debian (#151024) |
7 | 8 | ||
@@ -14,10 +15,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
14 | 1 file changed, 4 insertions(+) | 15 | 1 file changed, 4 insertions(+) |
15 | 16 | ||
16 | diff --git a/ld/ldelf.c b/ld/ldelf.c | 17 | diff --git a/ld/ldelf.c b/ld/ldelf.c |
17 | index a095d6aac5..a2455a8793 100644 | 18 | index b4784009d7a..541772f4604 100644 |
18 | --- a/ld/ldelf.c | 19 | --- a/ld/ldelf.c |
19 | +++ b/ld/ldelf.c | 20 | +++ b/ld/ldelf.c |
20 | @@ -1229,6 +1229,8 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd, | 21 | @@ -1247,6 +1247,8 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd, |
21 | && command_line.rpath == NULL) | 22 | && command_line.rpath == NULL) |
22 | { | 23 | { |
23 | path = (const char *) getenv ("LD_RUN_PATH"); | 24 | path = (const char *) getenv ("LD_RUN_PATH"); |
@@ -26,7 +27,7 @@ index a095d6aac5..a2455a8793 100644 | |||
26 | if (path | 27 | if (path |
27 | && ldelf_search_needed (path, &n, force, | 28 | && ldelf_search_needed (path, &n, force, |
28 | is_linux, elfsize)) | 29 | is_linux, elfsize)) |
29 | @@ -1573,6 +1575,8 @@ ldelf_before_allocation (char *audit, char *depaudit, | 30 | @@ -1605,6 +1607,8 @@ ldelf_before_allocation (char *audit, char *depaudit, |
30 | rpath = command_line.rpath; | 31 | rpath = command_line.rpath; |
31 | if (rpath == NULL) | 32 | if (rpath == NULL) |
32 | rpath = (const char *) getenv ("LD_RUN_PATH"); | 33 | rpath = (const char *) getenv ("LD_RUN_PATH"); |
@@ -35,3 +36,6 @@ index a095d6aac5..a2455a8793 100644 | |||
35 | 36 | ||
36 | for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) | 37 | for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) |
37 | if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) | 38 | if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) |
39 | -- | ||
40 | 2.28.0 | ||
41 | |||