Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/mpfr/2.4.1/110-assert.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> 
     1 diff -Naurd mpfr-2.4.1-a/PATCHES mpfr-2.4.1-b/PATCHES

     2 --- mpfr-2.4.1-a/PATCHES	2009-03-04 13:15:05.000000000 +0000

     3 +++ mpfr-2.4.1-b/PATCHES	2009-03-04 13:17:04.000000000 +0000

     4 @@ -0,0 +1 @@

     5 +assert

     6 diff -Naurd mpfr-2.4.1-a/VERSION mpfr-2.4.1-b/VERSION

     7 --- mpfr-2.4.1-a/VERSION	2009-02-27 16:55:37.000000000 +0000

     8 +++ mpfr-2.4.1-b/VERSION	2009-03-04 13:16:46.000000000 +0000

     9 @@ -1 +1 @@

    10 -2.4.1-p1

    11 +2.4.1-p2

    12 diff -Naurd mpfr-2.4.1-a/mpfr-gmp.c mpfr-2.4.1-b/mpfr-gmp.c

    13 --- mpfr-2.4.1-a/mpfr-gmp.c	2009-02-20 09:43:17.000000000 +0000

    14 +++ mpfr-2.4.1-b/mpfr-gmp.c	2009-03-04 13:16:39.000000000 +0000

    15 @@ -301,7 +301,7 @@

    16        if (linenum != -1)

    17          fprintf (stderr, "%d: ", linenum);

    18      }

    19 -  fprintf (stderr, " assertion failed: %s\n", expr);

    20 +  fprintf (stderr, "MPFR assertion failed: %s\n", expr);

    21    abort();

    22  }

    23  

    24 diff -Naurd mpfr-2.4.1-a/mpfr.h mpfr-2.4.1-b/mpfr.h

    25 --- mpfr-2.4.1-a/mpfr.h	2009-02-27 16:55:38.000000000 +0000

    26 +++ mpfr-2.4.1-b/mpfr.h	2009-03-04 13:16:46.000000000 +0000

    27 @@ -27,7 +27,7 @@

    28  #define MPFR_VERSION_MAJOR 2

    29  #define MPFR_VERSION_MINOR 4

    30  #define MPFR_VERSION_PATCHLEVEL 1

    31 -#define MPFR_VERSION_STRING "2.4.1-p1"

    32 +#define MPFR_VERSION_STRING "2.4.1-p2"

    33  

    34  /* Macros dealing with MPFR VERSION */

    35  #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))

    36 diff -Naurd mpfr-2.4.1-a/version.c mpfr-2.4.1-b/version.c

    37 --- mpfr-2.4.1-a/version.c	2009-02-27 16:55:38.000000000 +0000

    38 +++ mpfr-2.4.1-b/version.c	2009-03-04 13:16:46.000000000 +0000

    39 @@ -25,5 +25,5 @@

    40  const char *

    41  mpfr_get_version (void)

    42  {

    43 -  return "2.4.1-p1";

    44 +  return "2.4.1-p2";

    45  }
crosstool-ng