Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/binutils/2.20.1a/270-better_file_error.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Wed Dec 05 20:31:43 2012 +0100 (2012-12-05)
changeset 3134 863723936e24
parent 2088 4f21ba5f8e91
permissions -rw-r--r--
scripts/xldd: use user's sed and grep

xldd uses sed and grep as detected by ./configure. This works well if is
used on the machine that build the toolchain.

But if the user moves the toolchain to another machine where sed and grep
are not in the same directory (eg. /bin/sed vs. /usr/bin/sed), then xldd
will stop functionning.

Fix that by using ${SED} and ${GREP} if they are set in the environment.

Reported-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.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)
crosstool-ng