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@anciens.enib.fr>
Sat Dec 31 18:47:37 2011 +0100 (2011-12-31)
changeset 2829 0c3c95f911ec
permissions -rw-r--r--
docs: credit Konrad EISELE for the initial multilib support

Konrad submitted an initial patch adding multlib support:
http://sourceware.org/ml/crossgcc/2011-11/msg00040.html

The patch was full of good ideas, but had a few issues, so
I (Yann E. MORIN) started it all from scatch, re-using part
of the original patch. This got implemented in this series:
hg log -r 446a17b5dd1e:e47d17391ae3

As I forgot to credit Konrad in these changelogs, update the
docs so that the work by Konrad gets credited. Without his
initial effort, we would probably not have had multlib support
so soon. Thank you Konrad!

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.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