patches/gmp/4.2.4/110-mpf_set_str.patch
author "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
Thu Jul 28 22:09:31 2011 +0200 (2011-07-28)
changeset 2573 424fa2092ace
permissions -rw-r--r--
scripts/libc: do not build add-ons by default

Currently, no --enable-add-ons option is passed to libc configure when
"$(do_libc_add_ons_list ,)" is empty, which makes configure automatically search
for present add-ons. In that case, all present add-ons are built, although
no add-on was selected by the user in the config. Moreover, this can make the
configure fail if some non-standard add-ons like eglibc-localedef are present.

This behavior also leads to an inconsistency from a user point of view between
the following cases:
- LIBC_ADDONS_LIST="", LIBC_GLIBC_USE_PORTS=n and THREADS="none" in the config,
which makes "$(do_libc_add_ons_list ,)" return "", so all present add-ons
are built.
- LIBC_ADDONS_LIST="", LIBC_GLIBC_USE_PORTS=n and THREADS!="none" in the
config, which makes "$(do_libc_add_ons_list ,)" return the add-on supporting
the chosen threading implementation, e.g. "nptl", so only this add-on is
built.

This patch disables the building of all add-ons in that case.

It is still possible to build all present add-ons by adding --enable-add-ons to
LIBC_GLIBC_EXTRA_CONFIG_ARRAY.

Signed-off-by: "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
yann@1250
     1
Original patch from: mpf_set_str.c.4.diff
yann@1250
     2
yann@1250
     3
-= BEGIN original header =-
yann@1250
     4
-= END original header =-
yann@1250
     5
yann@1250
     6
diff -durN gmp-4.2.4.orig/mpf/set_str.c gmp-4.2.4/mpf/set_str.c
yann@1250
     7
--- gmp-4.2.4.orig/mpf/set_str.c	2008-08-25 16:11:37.000000000 +0200
yann@1250
     8
+++ gmp-4.2.4/mpf/set_str.c	2009-03-08 18:36:16.000000000 +0100
yann@1250
     9
@@ -137,7 +137,12 @@
yann@1250
    10
       c = (unsigned char) *++str;
yann@1250
    11
     }
yann@1250
    12
 
yann@1250
    13
+  /* Default base to decimal.  */
yann@1250
    14
+  if (base == 0)
yann@1250
    15
+    base = 10;
yann@1250
    16
+
yann@1250
    17
   exp_base = base;
yann@1250
    18
+
yann@1250
    19
   if (base < 0)
yann@1250
    20
     {
yann@1250
    21
       exp_base = 10;
yann@1250
    22
@@ -165,10 +170,6 @@
yann@1250
    23
 	return -1;
yann@1250
    24
     }
yann@1250
    25
 
yann@1250
    26
-  /* Default base to decimal.  */
yann@1250
    27
-  if (base == 0)
yann@1250
    28
-    base = 10;
yann@1250
    29
-
yann@1250
    30
   /* Locate exponent part of the input.  Look from the right of the string,
yann@1250
    31
      since the exponent is usually a lot shorter than the mantissa.  */
yann@1250
    32
   expptr = NULL;