diff options
| author |   Alexey Neyman <stilor@att.net> | 2017-08-24 23:24:09 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2017-08-24 23:24:09 (GMT) |
| commit | 1b3ed29eb9add1b9bc9773fe2565cc5af09810a8 (patch) | |
| tree | 1a2693774071358985340fbbc70c3fb4fc5ba928 /packages/binutils/2.28.1/300-012_check_ldrunpath_length.patch | |
| parent | 8e8417226d5cdd90896df2c585ad03a995e5e9a1 (diff) | |
| parent | 961ea1938204e4fc9199c2ff5933caaa1e3d0710 (diff) | |
Merge pull request #810 from stilor/fix-patching-ports
Fix patching ports
Diffstat (limited to 'packages/binutils/2.28.1/300-012_check_ldrunpath_length.patch')
| -rw-r--r-- | packages/binutils/2.28.1/300-012_check_ldrunpath_length.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/packages/binutils/2.28.1/300-012_check_ldrunpath_length.patch b/packages/binutils/2.28.1/300-012_check_ldrunpath_length.patch new file mode 100644 index 0000000..f1f31af --- /dev/null +++ b/packages/binutils/2.28.1/300-012_check_ldrunpath_length.patch @@ -0,0 +1,22 @@ +diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em +index 137446f..bb8391a 100644 +--- a/ld/emultempl/elf32.em ++++ b/ld/emultempl/elf32.em +@@ -1195,6 +1195,8 @@ fragment <<EOF + && 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; +@@ -1458,6 +1460,8 @@ gld${EMULATION_NAME}_before_allocation (void) + rpath = command_line.rpath; + if (rpath == NULL) + rpath = (const char *) getenv ("LD_RUN_PATH"); ++ if ((rpath) && (*rpath == '\0')) ++ rpath = NULL; + + for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) + if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) |