diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2019-11-17 13:34:36 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2019-11-17 13:34:36 +0300 |
| commit | 6cf4e270d951dccb5cabe70d865415d2628c7a4e (patch) | |
| tree | 119cbca714d74244d1aa4e2241e59fbf8450d30d /debian/patches/012_check_ldrunpath_length.patch | |
| parent | f0ef3d0a5cb2410eab2b1b412e7ec7ef94fa0dc6 (diff) | |
| download | binutils-debian.tar.gz | |
Import 2.33.1-2debian/2.33.1-2debian
Diffstat (limited to 'debian/patches/012_check_ldrunpath_length.patch')
| -rw-r--r-- | debian/patches/012_check_ldrunpath_length.patch | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/debian/patches/012_check_ldrunpath_length.patch b/debian/patches/012_check_ldrunpath_length.patch index 012f838..74f6333 100644 --- a/debian/patches/012_check_ldrunpath_length.patch +++ b/debian/patches/012_check_ldrunpath_length.patch @@ -1,20 +1,18 @@ Author: Chris Chimelis <chris@debian.org> Description: Only generate an RPATH entry if LD_RUN_PATH is not empty, for cases where -rpath isn't specified. (#151024) -Index: b/ld/emultempl/elf32.em -=================================================================== --- a/ld/emultempl/elf32.em +++ b/ld/emultempl/elf32.em -@@ -1411,6 +1411,8 @@ fragment <<EOF +@@ -1470,6 +1470,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)) + path = (const char *) getenv ("LD_RUN_PATH"); ++ if ((path) && (strlen (path) == 0)) ++ path = NULL; + if (path + && gld${EMULATION_NAME}_search_needed (path, &n, force)) break; -@@ -1692,6 +1694,8 @@ gld${EMULATION_NAME}_before_allocation ( +@@ -1745,6 +1747,8 @@ gld${EMULATION_NAME}_before_allocation ( rpath = command_line.rpath; if (rpath == NULL) rpath = (const char *) getenv ("LD_RUN_PATH"); |