Mercurialcrosstool-ng / annotate
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/mpfr/2.4.1/130-vasprintf-mp_limb_t.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@1322 
     1
 
diff -Naurd mpfr-2.4.1-a/PATCHES mpfr-2.4.1-b/PATCHES
yann@1322 
     2
 
--- mpfr-2.4.1-a/PATCHES	2009-03-10 01:44:39.000000000 +0000
yann@1322 
     3
 
+++ mpfr-2.4.1-b/PATCHES	2009-03-10 01:44:40.000000000 +0000
yann@1322 
     4
 
@@ -0,0 +1 @@
yann@1322 
     5
 
+vasprintf-mp_limb_t
yann@1322 
     6
 
diff -Naurd mpfr-2.4.1-a/VERSION mpfr-2.4.1-b/VERSION
yann@1322 
     7
 
--- mpfr-2.4.1-a/VERSION	2009-03-04 13:16:46.000000000 +0000
yann@1322 
     8
 
+++ mpfr-2.4.1-b/VERSION	2009-03-10 01:44:40.000000000 +0000
yann@1322 
     9
 
@@ -1 +1 @@
yann@1322 
    10
 
-2.4.1-p2
yann@1322 
    11
 
+2.4.1-p4
yann@1322 
    12
 
diff -Naurd mpfr-2.4.1-a/mpfr.h mpfr-2.4.1-b/mpfr.h
yann@1322 
    13
 
--- mpfr-2.4.1-a/mpfr.h	2009-03-04 13:16:46.000000000 +0000
yann@1322 
    14
 
+++ mpfr-2.4.1-b/mpfr.h	2009-03-10 01:44:40.000000000 +0000
yann@1322 
    15
 
@@ -27,7 +27,7 @@
yann@1322 
    16
 
 #define MPFR_VERSION_MAJOR 2
yann@1322 
    17
 
 #define MPFR_VERSION_MINOR 4
yann@1322 
    18
 
 #define MPFR_VERSION_PATCHLEVEL 1
yann@1322 
    19
 
-#define MPFR_VERSION_STRING "2.4.1-p2"
yann@1322 
    20
 
+#define MPFR_VERSION_STRING "2.4.1-p4"
yann@1322 
    21
yann@1322 
    22
 
 /* Macros dealing with MPFR VERSION */
yann@1322 
    23
 
 #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
yann@1322 
    24
 
diff -Naurd mpfr-2.4.1-a/vasprintf.c mpfr-2.4.1-b/vasprintf.c
yann@1322 
    25
 
--- mpfr-2.4.1-a/vasprintf.c	2009-02-20 09:43:17.000000000 +0000
yann@1322 
    26
 
+++ mpfr-2.4.1-b/vasprintf.c	2009-03-10 01:44:40.000000000 +0000
yann@1322 
    27
 
@@ -398,7 +398,7 @@
yann@1322 
    28
 
         (void) va_arg ((ap), mpq_srcptr);       \
yann@1322 
    29
 
         break;                                  \
yann@1322 
    30
 
       case MP_LIMB_ARG:                         \
yann@1322 
    31
 
-        (void) va_arg ((ap), mp_ptr);           \
yann@1322 
    32
 
+        (void) va_arg ((ap), mp_limb_t);        \
yann@1322 
    33
 
         break;                                  \
yann@1322 
    34
 
       case MP_LIMB_ARRAY_ARG:                   \
yann@1322 
    35
 
         (void) va_arg ((ap), mp_ptr);           \
yann@1322 
    36
 
diff -Naurd mpfr-2.4.1-a/version.c mpfr-2.4.1-b/version.c
yann@1322 
    37
 
--- mpfr-2.4.1-a/version.c	2009-03-04 13:16:46.000000000 +0000
yann@1322 
    38
 
+++ mpfr-2.4.1-b/version.c	2009-03-10 01:44:40.000000000 +0000
yann@1322 
    39
 
@@ -25,5 +25,5 @@
yann@1322 
    40
 
 const char *
yann@1322 
    41
 
 mpfr_get_version (void)
yann@1322 
    42
 
 {
yann@1322 
    43
 
-  return "2.4.1-p2";
yann@1322 
    44
 
+  return "2.4.1-p4";
yann@1322 
    45
 
 }
crosstool-ng