Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/ports-2.10.1/110-binutils-2.20-compat.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Wed Dec 05 20:31:43 2012 +0100 (2012-12-05)
changeset 3134 863723936e24
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 

     2 

     3 diff -durN glibc-2.10.1.orig/configure glibc-2.10.1/configure

     4 --- glibc-2.10.1.orig/configure	2009-05-17 14:19:31.000000000 +0200

     5 +++ glibc-2.10.1/configure	2009-11-13 00:49:43.000000000 +0100

     6 @@ -4839,7 +4839,7 @@

     7    ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'`

     8    case $ac_prog_version in

     9      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;

    10 -    2.1[3-9]*)

    11 +    2.1[3-9]*|[2-9].[2-9]*)

    12         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;

    13      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;

    14  

    15 @@ -4902,7 +4902,7 @@

    16    ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'`

    17    case $ac_prog_version in

    18      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;

    19 -    2.1[3-9]*)

    20 +    2.1[3-9]*|[2-9].[2-9]*)

    21         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;

    22      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;

    23  

    24 diff -durN glibc-2.10.1.orig/configure.in glibc-2.10.1/configure.in

    25 --- glibc-2.10.1.orig/configure.in	2009-04-04 01:51:47.000000000 +0200

    26 +++ glibc-2.10.1/configure.in	2009-11-13 00:49:43.000000000 +0100

    27 @@ -897,10 +897,10 @@

    28  # Accept binutils 2.13 or newer.

    29  AC_CHECK_PROG_VER(AS, $AS, --version,

    30  		  [GNU assembler.* \([0-9]*\.[0-9.]*\)],

    31 -		  [2.1[3-9]*], AS=: critic_missing="$critic_missing as")

    32 +		  [2.1[3-9]*|[2-9].[2-9]*], AS=: critic_missing="$critic_missing as")

    33  AC_CHECK_PROG_VER(LD, $LD, --version,

    34  		  [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)],

    35 -		  [2.1[3-9]*], LD=: critic_missing="$critic_missing ld")

    36 +		  [2.1[3-9]*|[2-9].[2-9]*], LD=: critic_missing="$critic_missing ld")

    37  

    38  # We need the physical current working directory.  We cannot use the

    39  # "pwd -P" shell builtin since that's not portable.  Instead we try to
crosstool-ng