patches/gmp/4.2.2/100-mpf_set_str.patch
author "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
Wed Dec 14 16:55:22 2011 +0100 (2011-12-14)
branch1.13
changeset 2848 1ff89596dab0
parent 466 7f9bbf94b0bb
permissions -rw-r--r--
libc/eglibc: fix localedef 2.14 build

The localedef of eglibc 2.14 requires NOT_IN_libc to be defined in order to
compile intl/l10nflist.c.

This is because localedef is built separately from eglibc and uses some parts of
eglibc that don't compile in standalone without this preprocessor definition.

This fixes the following error:

[ALL ] gcc -g -O2 -DNO_SYSCONF -DNO_UNCOMPRESS
-DLOCALE_PATH='"/usr/lib/locale:/usr/share/i18n"'
-DLOCALEDIR='"/usr/lib/locale"' -DLOCALE_ALIAS_PATH='"/usr/share/locale"'
-DCHARMAP_PATH='"/usr/share/i18n/charmaps"'
-DREPERTOIREMAP_PATH='"/usr/share/i18n/repertoiremaps"'
-DLOCSRCDIR='"/usr/share/i18n/locales"' -Iglibc/locale/programs -Iglibc/locale
-I/<snip>/.build/src/eglibc-localedef-2_14/include
-I/<snip>/.build/src/eglibc-localedef-2_14 -I.
-include /<snip>/.build/src/eglibc-localedef-2_14/include/always.h -Wall
-Wno-format -c -o locarchive.o glibc/locale/programs/locarchive.c
[ALL ] glibc/locale/programs/locarchive.c: In function 'enlarge_archive':
[ALL ] glibc/locale/programs/locarchive.c:303:21: warning: variable
'oldlocrectab' set but not used [-Wunused-but-set-variable]
[ALL ] In file included from glibc/locale/programs/locarchive.c:651:0:
[ALL ] glibc/locale/programs/../../intl/l10nflist.c: In function
'_nl_normalize_codeset':
[ERROR] glibc/locale/programs/../../intl/l10nflist.c:342:9: error:
'_nl_C_locobj_ptr' undeclared (first use in this function)
[ALL ] glibc/locale/programs/../../intl/l10nflist.c:342:9: note: each
undeclared identifier is reported only once for each function it appears in
[ALL ] glibc/locale/programs/locarchive.c: In function
'add_locales_to_archive':
[ALL ] glibc/locale/programs/locarchive.c:1450:7: warning: passing argument
1 of '__xpg_basename' discards 'const' qualifier from pointer target type
[enabled by default]
[ALL ] /usr/include/libgen.h:35:14: note: expected 'char *' but argument is
of type 'const char *'
[ERROR] make[1]: *** [locarchive.o] Error 1

Signed-off-by: "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
(transplanted from 4cd9134739b594451794cf61a6e1b137422cdafd)
     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)