patches/binutils/2.18/100-makeinfo-version.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu May 19 23:05:32 2011 +0200 (2011-05-19)
branch1.11
changeset 2463 7f87237857a0
permissions -rw-r--r--
complibs/ppl: update GMP location configuration argument for PPL v0.11 and later

'configure' for PPL 0.11 (and later) needs "--with-gmp-prefix" to
provide the location of the GMP toolkit; the previous switches were
"--with-libgmp-prefix" and "--with-libgmpxx-prefix".

The upstream log message is:

commit 08dfb6fea094f8c5a533575a3ea2095edce99a6d
Author: Roberto Bagnara <bagnara@cs.unipr.it>
Date: Sun Jul 12 21:39:46 2009 +0200

New configure option --with-gmp-prefix supersedes the (now removed)
options --with-libgmp-prefix and --with-libgmpxx-prefix.

Link: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=08dfb6fea094f8c5a533575a3ea2095edce99a6d

Since PPL's 'configure' ignores unknown switches, we use all three so we
don't have to conditionalize the ppl.sh build script itself.

Signed-Off-By: Anthony Foiani <anthony.foiani@gmail.com>
(transplanted from 4f0c4fb572e2862c24b28e8d27ce7e9cb9adba65)
     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"