patches/binutils/2.18a/100-makeinfo-version.patch
author Daniel Price <daniel.price@gmail.com>
Tue Nov 20 16:59:17 2012 -0800 (2012-11-20)
changeset 3125 15cd5dc25929
parent 406 c33f2e996017
permissions -rw-r--r--
scripts: fail on ':' in paths

Signed-off-by: Daniel Price <daniel.price@gmail.com>
[yann.morin.1998@free.fr: split original patch for self-contained changes]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Message-Id: <163f86b5216fc08c672a.1353459722@nipigon.dssd.com>
Patchwork-Id: 200536
     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"