patches/gmp/4.2.2/100-mpf_set_str.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu May 19 23:09:43 2011 +0200 (2011-05-19)
branch1.11
changeset 2465 5f98b7a90fbc
parent 466 7f9bbf94b0bb
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)
     1 Original patch from http://gmplib.org/patches/mpf_set_str.c.diff
     2 Re-diffed to match crosstool-NG conventions.
     3 
     4 diff -dur gmp-4.2.2.orig/mpf/set_str.c gmp-4.2.2/mpf/set_str.c
     5 --- gmp-4.2.2.orig/mpf/set_str.c	2007-08-30 20:31:40.000000000 +0200
     6 +++ gmp-4.2.2/mpf/set_str.c	2008-01-28 23:05:29.000000000 +0100
     7 @@ -271,8 +271,29 @@
     8        }
     9  
    10      if (expptr != 0)
    11 -      /* FIXME: Should do some error checking here.  */
    12 -      exp_in_base = strtol (expptr, (char **) 0, exp_base);
    13 +      {
    14 +	/* Scan and convert the exponent, in base exp_base.  */
    15 +	long dig, neg = -(long) ('-' == expptr[0]);
    16 +	expptr -= neg;			/* conditional increment */
    17 +	c = (unsigned char) *expptr++;
    18 +	dig = digit_value[c];
    19 +	if (dig >= exp_base)
    20 +	  {
    21 +	    TMP_FREE;
    22 +	    return -1;
    23 +	  }
    24 +	exp_in_base = dig;
    25 +	c = (unsigned char) *expptr++;
    26 +	dig = digit_value[c];
    27 +	while (dig < exp_base)
    28 +	  {
    29 +	    exp_in_base = exp_in_base * exp_base;
    30 +	    exp_in_base += dig;
    31 +	    c = (unsigned char) *expptr++;
    32 +	    dig = digit_value[c];
    33 +	  }
    34 +	exp_in_base = (exp_in_base ^ neg) - neg; /* conditional negation */
    35 +      }
    36      else
    37        exp_in_base = 0;
    38      if (dotpos != 0)