diff options
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils-2.23.2/binutils-uclibc-300-012_check_ldrunpath_length.patch')
-rw-r--r-- | meta/recipes-devtools/binutils/binutils-2.23.2/binutils-uclibc-300-012_check_ldrunpath_length.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-2.23.2/binutils-uclibc-300-012_check_ldrunpath_length.patch b/meta/recipes-devtools/binutils/binutils-2.23.2/binutils-uclibc-300-012_check_ldrunpath_length.patch new file mode 100644 index 0000000000..d31f80cd3d --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils-2.23.2/binutils-uclibc-300-012_check_ldrunpath_length.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | #!/bin/sh -e | ||
2 | ## 012_check_ldrunpath_length.dpatch by Chris Chimelis <chris@debian.org> | ||
3 | ## | ||
4 | ## All lines beginning with `## DP:' are a description of the patch. | ||
5 | ## DP: Only generate an RPATH entry if LD_RUN_PATH is not empty, for | ||
6 | ## DP: cases where -rpath isn't specified. (#151024) | ||
7 | |||
8 | if [ $# -ne 1 ]; then | ||
9 | echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" | ||
10 | exit 1 | ||
11 | fi | ||
12 | |||
13 | [ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts | ||
14 | patch_opts="${patch_opts:--f --no-backup-if-mismatch}" | ||
15 | |||
16 | case "$1" in | ||
17 | -patch) patch $patch_opts -p1 < $0;; | ||
18 | -unpatch) patch $patch_opts -p1 -R < $0;; | ||
19 | *) | ||
20 | echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" | ||
21 | exit 1;; | ||
22 | esac | ||
23 | |||
24 | exit 0 | ||
25 | Upstream-Status: Inappropriate [debian patch] | ||
26 | |||
27 | @DPATCH@ | ||
28 | Index: binutils-2.22/ld/emultempl/elf32.em | ||
29 | =================================================================== | ||
30 | --- binutils-2.22.orig/ld/emultempl/elf32.em | ||
31 | +++ binutils-2.22/ld/emultempl/elf32.em | ||
32 | @@ -1273,6 +1273,8 @@ fragment <<EOF | ||
33 | && command_line.rpath == NULL) | ||
34 | { | ||
35 | lib_path = (const char *) getenv ("LD_RUN_PATH"); | ||
36 | + if ((lib_path) && (strlen (lib_path) == 0)) | ||
37 | + lib_path = NULL; | ||
38 | if (gld${EMULATION_NAME}_search_needed (lib_path, &n, | ||
39 | force)) | ||
40 | break; | ||
41 | @@ -1500,6 +1502,8 @@ gld${EMULATION_NAME}_before_allocation ( | ||
42 | rpath = command_line.rpath; | ||
43 | if (rpath == NULL) | ||
44 | rpath = (const char *) getenv ("LD_RUN_PATH"); | ||
45 | + if ((rpath) && (strlen (rpath) == 0)) | ||
46 | + rpath = NULL; | ||
47 | |||
48 | for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next) | ||
49 | if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) | ||