patches/binutils/2.20.1/270-better_file_error.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Thu Feb 17 21:54:07 2011 +0100 (2011-02-17)
changeset 2301 a3818c3b03e0
parent 1700 eccc37dd1a25
permissions -rw-r--r--
internals: fix stripping host binaries

The gcc used by linaro has a version number specific to Linaro, but
identifies itself with its upstream version numbering scheme.

This breaks the strip in the finish step, because the actual gcc version
is not the same as the configured one (eg. 4.5.2 vs. linaro-4.5-2011.02-0).

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
     1 #!/bin/sh -e
     2 ## 006_better_file_error.dpatch by David Kimdon <dwhedon@gordian.com>
     3 ##
     4 ## All lines beginning with `## DP:' are a description of the patch.
     5 ## DP: Specify which filename is causing an error if the filename is a
     6 ## DP: directory. (#45832)
     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 
    26 @DPATCH@
    27 diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c binutils-2.14.90.0.6/bfd/opncls.c
    28 
    29 diff -durN binutils-2.20.1.orig/bfd/opncls.c binutils-2.20.1/bfd/opncls.c
    30 --- binutils-2.20.1.orig/bfd/opncls.c	2010-01-14 11:48:22.000000000 +0100
    31 +++ binutils-2.20.1/bfd/opncls.c	2010-08-17 19:32:23.000000000 +0200
    32 @@ -183,6 +183,13 @@
    33  {
    34    bfd *nbfd;
    35    const bfd_target *target_vec;
    36 +  struct stat s;
    37 +
    38 +  if (stat (filename, &s) == 0)
    39 +    if (S_ISDIR(s.st_mode)) {
    40 +      bfd_set_error (bfd_error_file_not_recognized);
    41 +      return NULL;
    42 +    }
    43  
    44    nbfd = _bfd_new_bfd ();
    45    if (nbfd == NULL)