yann@1: #!/bin/sh -e yann@1: ## 012_check_ldrunpath_length.dpatch by Chris Chimelis yann@1: ## yann@1: ## All lines beginning with `## DP:' are a description of the patch. yann@1: ## DP: Only generate an RPATH entry if LD_RUN_PATH is not empty, for yann@1: ## DP: cases where -rpath isn't specified. (#151024) yann@1: yann@1: if [ $# -ne 1 ]; then yann@1: echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" yann@1: exit 1 yann@1: fi yann@1: yann@1: [ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts yann@1: patch_opts="${patch_opts:--f --no-backup-if-mismatch}" yann@1: yann@1: case "$1" in yann@1: -patch) patch $patch_opts -p1 < $0;; yann@1: -unpatch) patch $patch_opts -p1 -R < $0;; yann@1: *) yann@1: echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" yann@1: exit 1;; yann@1: esac yann@1: yann@1: exit 0 yann@1: yann@1: @DPATCH@ yann@1: diff -urNad /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em binutils-2.15/ld/emultempl/elf32.em yann@1: --- /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em 2004-05-21 23:12:58.000000000 +0100 yann@1: +++ binutils-2.15/ld/emultempl/elf32.em 2004-05-21 23:12:59.000000000 +0100 yann@1: @@ -692,6 +692,8 @@ yann@1: && command_line.rpath == NULL) yann@1: { yann@1: lib_path = (const char *) getenv ("LD_RUN_PATH"); yann@1: + if ((lib_path) && (strlen (lib_path) == 0)) yann@1: + lib_path = NULL; yann@1: if (gld${EMULATION_NAME}_search_needed (lib_path, &n, yann@1: force)) yann@1: break; yann@1: @@ -871,6 +873,8 @@ yann@1: rpath = command_line.rpath; yann@1: if (rpath == NULL) yann@1: rpath = (const char *) getenv ("LD_RUN_PATH"); yann@1: + if ((rpath) && (strlen (rpath) == 0)) yann@1: + rpath = NULL; yann@1: if (! (bfd_elf_size_dynamic_sections yann@1: (output_bfd, command_line.soname, rpath, yann@1: command_line.filter_shlib,