yann@1614: #!/bin/sh -e
yann@1614: ## 012_check_ldrunpath_length.dpatch by Chris Chimelis <chris@debian.org>
yann@1614: ##
yann@1614: ## All lines beginning with `## DP:' are a description of the patch.
yann@1614: ## DP: Only generate an RPATH entry if LD_RUN_PATH is not empty, for
yann@1614: ## DP: cases where -rpath isn't specified. (#151024)
yann@1614: 
yann@1614: if [ $# -ne 1 ]; then
yann@1614:     echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
yann@1614:     exit 1
yann@1614: fi
yann@1614: 
yann@1614: [ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
yann@1614: patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
yann@1614: 
yann@1614: case "$1" in
yann@1614:        -patch) patch $patch_opts -p1 < $0;;
yann@1614:        -unpatch) patch $patch_opts -p1 -R < $0;;
yann@1614:         *)
yann@1614:                 echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
yann@1614:                 exit 1;;
yann@1614: esac
yann@1614: 
yann@1614: exit 0
yann@1614: 
yann@1614: @DPATCH@
yann@1614: diff -urNad /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em binutils-2.15/ld/emultempl/elf32.em
yann@2088: 
yann@2088: diff -durN binutils-2.20.1.orig/ld/emultempl/elf32.em binutils-2.20.1/ld/emultempl/elf32.em
yann@2088: --- binutils-2.20.1.orig/ld/emultempl/elf32.em	2009-09-14 13:43:30.000000000 +0200
yann@2088: +++ binutils-2.20.1/ld/emultempl/elf32.em	2010-08-17 19:32:09.000000000 +0200
yann@2088: @@ -1233,6 +1233,8 @@
yann@1614:  	      && command_line.rpath == NULL)
yann@1614:  	    {
yann@1614:  	      lib_path = (const char *) getenv ("LD_RUN_PATH");
yann@1614: +	      if ((lib_path) && (strlen (lib_path) == 0))
yann@1614: +		  lib_path = NULL;
yann@1614:  	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
yann@1614:  						      force))
yann@1614:  		break;
yann@2088: @@ -1418,6 +1420,8 @@
yann@1614:    rpath = command_line.rpath;
yann@1614:    if (rpath == NULL)
yann@1614:      rpath = (const char *) getenv ("LD_RUN_PATH");
yann@1614: +  if ((rpath) && (strlen (rpath) == 0))
yann@1614: +      rpath = NULL;
yann@1614:    if (! (bfd_elf_size_dynamic_sections
fr@1621:  	 (link_info.output_bfd, command_line.soname, rpath,
yann@1614:  	  command_line.filter_shlib,