Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/ppl/0.10.2/100-fix-configure-with-gmp-5_0_1.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Tue Mar 11 22:11:43 2014 +0100 (2014-03-11)
changeset 3293 e11a8a2e225d
permissions -rw-r--r--
comptools: do not force build of make-3.81 unless really needed

On systems with make-3.82, we forcibly force the build and the use
of make-3.81

But some newer tools break when building with make-3.81. For example,
eglibc-3.18 breaks.

Introduce a new blind options that tools may select if they require
make-3.81. If the system does not have make-3.81, and this option is
selected, then we force the build of make-3.81. Otherwise, we leave
it to the user to decide on his own.

Note that no component selects this option for now. It will come in
later patches as we find them.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> 
     1 --- ppl-0.10.2/configure.orig	2010-08-04 21:48:19.000000000 -0400

     2 +++ ppl-0.10.2/configure	2010-08-04 21:50:04.000000000 -0400

     3 @@ -16443,6 +16443,10 @@

     4  #GMP version 4.1.3 or higher is required

     5  #endif

     6  

     7 +#ifndef BITS_PER_MP_LIMB

     8 +#define BITS_PER_MP_LIMB GMP_LIMB_BITS

     9 +#endif

    10 +

    11  int

    12  main() {

    13    std::string header_version;

    14 @@ -16469,11 +16473,11 @@

    15      return 1;

    16    }

    17  

    18 -  if (sizeof(mp_limb_t)*CHAR_BIT != GMP_LIMB_BITS

    19 -      || GMP_LIMB_BITS != mp_bits_per_limb) {

    20 +  if (sizeof(mp_limb_t)*CHAR_BIT != BITS_PER_MP_LIMB

    21 +      || BITS_PER_MP_LIMB != mp_bits_per_limb) {

    22      std::cerr

    23        << "GMP header (gmp.h) and library (ligmp.*) bits-per-limb mismatch:\n"

    24 -      << "header gives " << __GMP_BITS_PER_MP_LIMB << ";\n"

    25 +      << "header gives " << BITS_PER_MP_LIMB << ";\n"

    26        << "library gives " << mp_bits_per_limb << ".\n"

    27        << "This probably means you are on a bi-arch system and\n"

    28        << "you are compiling with the wrong header or linking with\n"
crosstool-ng