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