0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch 1.2 KB

1234567891011121314151617181920212223242526272829303132333435363738
  1. From 63157cb403b6aa13147840c036a8555c4ea9c166 Mon Sep 17 00:00:00 2001
  2. From: Khem Raj <raj.khem@gmail.com>
  3. Date: Thu, 10 Mar 2022 21:21:33 -0800
  4. Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty
  5. for cases where -rpath isn't specified. debian (#151024)
  6. Upstream-Status: Pending
  7. Signed-off-by: Chris Chimelis <chris@debian.org>
  8. Signed-off-by: Khem Raj <raj.khem@gmail.com>
  9. ---
  10. ld/ldelf.c | 5 +++++
  11. 1 file changed, 5 insertions(+)
  12. diff --git a/ld/ldelf.c b/ld/ldelf.c
  13. index 0d61a3209ec..cd0da2013e2 100644
  14. --- a/ld/ldelf.c
  15. +++ b/ld/ldelf.c
  16. @@ -1127,6 +1127,9 @@ ldelf_handle_dt_needed (struct elf_link_hash_table *htab,
  17. && command_line.rpath == NULL)
  18. {
  19. path = (const char *) getenv ("LD_RUN_PATH");
  20. + if ((path) && (strlen (path) == 0))
  21. + path = NULL;
  22. +
  23. if (path
  24. && ldelf_search_needed (path, &n, force,
  25. is_linux, elfsize))
  26. @@ -1801,6 +1804,8 @@ ldelf_before_allocation (char *audit, char *depaudit,
  27. rpath = command_line.rpath;
  28. if (rpath == NULL)
  29. rpath = (const char *) getenv ("LD_RUN_PATH");
  30. + if ((rpath) && (strlen (rpath) == 0))
  31. + rpath = NULL;
  32. for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
  33. if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)