patches/ppl/0.10.2/100-fix-configure-with-gmp-5_0_1.patch
author Yann Diorcet (diorcet.yann@gmail.com)
Fri Nov 16 14:59:27 2012 +0100 (2012-11-16)
changeset 3115 1c68438f44f7
permissions -rw-r--r--
complibs: introduce generic multi-complibs infrastructure

Use the same method as companion tools for providing generic and
extendable companion libs.

Signed-off-by: Yann Diorcet <diorcet.yann@gmail.com>
Message-Id: <515c5c4635d99ebe4877.1353074410@macbook-smorlat.local>
Patchwork-Id: 199613
     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"