patches/binutils/2.18/100-makeinfo-version.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Jul 12 23:52:24 2011 +0200 (2011-07-12)
branch1.11
changeset 2558 b7317d2fe0e9
permissions -rw-r--r--
scripts, cc/gcc: do not fail on existing symlinks or build.log

If the user builds a toolchain over an existing one, so, without removing
CT_PREFIX_DIR, the build fails as the symlinks already exist, as does the
build.log.

This can also happen (for build.log) if the user first ran in download-
or extract-only.

Patch (with no SoB) originally from:
Phil Wilshire <phil.wilshire@overturenetworks.com>

Modified by me as it did not apply cleanly.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
(transplanted from 1ebc2248cc60230cd53ff94ae8f8f1e3261461a3)
     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"