Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/binutils/2.18a/100-makeinfo-version.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 406 c33f2e996017
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 diff -u binutils-2.18-orig/configure binutils-2.18/configure

     2 --- binutils-2.18-orig/configure	2007-08-06 16:29:40.000000000 -0400

     3 +++ binutils-2.18/configure	2007-09-27 22:41:51.000000000 -0400

     4 @@ -6125,10 +6125,10 @@

     5    *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;;

     6    *)

     7  

     8 -    # For an installed makeinfo, we require it to be from texinfo 4.4 or

     9 +    # For an installed makeinfo, we require it to be from texinfo 4.6 or

    10      # higher, else we use the "missing" dummy.

    11      if ${MAKEINFO} --version \

    12 -       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then

    13 +       | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then

    14        :

    15      else

    16        MAKEINFO="$MISSING makeinfo"

    17 diff -u binutils-2.18-orig/configure.ac binutils-2.18/configure.ac

    18 --- binutils-2.18-orig/configure.ac	2007-08-28 16:24:26.000000000 -0400

    19 +++ binutils-2.18/configure.ac	2007-09-27 22:41:00.000000000 -0400

    20 @@ -2400,10 +2400,10 @@

    21    *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;;

    22    *)

    23  changequote(,)

    24 -    # For an installed makeinfo, we require it to be from texinfo 4.4 or

    25 +    # For an installed makeinfo, we require it to be from texinfo 4.6 or

    26      # higher, else we use the "missing" dummy.

    27      if ${MAKEINFO} --version \

    28 -       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then

    29 +       | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then

    30        :

    31      else

    32        MAKEINFO="$MISSING makeinfo"
crosstool-ng