patches/binutils/2.18/100-makeinfo-version.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu May 19 23:09:43 2011 +0200 (2011-05-19)
branch1.11
changeset 2465 5f98b7a90fbc
permissions -rw-r--r--
complibs/ppl: fix 0.11-0.11.2 to compile with --disable-shared

PPL 0.11 (through 0.11.2) had a small bug where it still tried to build
and test its Java interface even when shared libraries are disabled.
Since that's exactly what ct-ng does, it explodes.

This is the patch from the PPL authors (see final link below).

More information can be found in these messages/threads:

Anthony's initial report and analysis with Yann:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00046.html

Ron Flory hit the same problem:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00054.html

Anthony's report to the ppl-devel list:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017450.html

Roberto's reply with a link to the fix in the PPL git repo:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017455.html

Signed-Off-By: Anthony Foiani <anthony.foiani@gmail.com>
(transplanted from 139b85d70b623e51f7585e7c64ecb8c6a6cf4567)
yann@406
     1
diff -u binutils-2.18-orig/configure binutils-2.18/configure
yann@406
     2
--- binutils-2.18-orig/configure	2007-08-06 16:29:40.000000000 -0400
yann@406
     3
+++ binutils-2.18/configure	2007-09-27 22:41:51.000000000 -0400
yann@406
     4
@@ -6125,10 +6125,10 @@
yann@406
     5
   *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;;
yann@406
     6
   *)
yann@406
     7
 
yann@406
     8
-    # For an installed makeinfo, we require it to be from texinfo 4.4 or
yann@406
     9
+    # For an installed makeinfo, we require it to be from texinfo 4.6 or
yann@406
    10
     # higher, else we use the "missing" dummy.
yann@406
    11
     if ${MAKEINFO} --version \
yann@406
    12
-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
yann@406
    13
+       | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
yann@406
    14
       :
yann@406
    15
     else
yann@406
    16
       MAKEINFO="$MISSING makeinfo"
yann@406
    17
diff -u binutils-2.18-orig/configure.ac binutils-2.18/configure.ac
yann@406
    18
--- binutils-2.18-orig/configure.ac	2007-08-28 16:24:26.000000000 -0400
yann@406
    19
+++ binutils-2.18/configure.ac	2007-09-27 22:41:00.000000000 -0400
yann@406
    20
@@ -2400,10 +2400,10 @@
yann@406
    21
   *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;;
yann@406
    22
   *)
yann@406
    23
 changequote(,)
yann@406
    24
-    # For an installed makeinfo, we require it to be from texinfo 4.4 or
yann@406
    25
+    # For an installed makeinfo, we require it to be from texinfo 4.6 or
yann@406
    26
     # higher, else we use the "missing" dummy.
yann@406
    27
     if ${MAKEINFO} --version \
yann@406
    28
-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
yann@406
    29
+       | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
yann@406
    30
       :
yann@406
    31
     else
yann@406
    32
       MAKEINFO="$MISSING makeinfo"