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 Anthony Foiani <anthony.foiani@gmail.com>
Thu May 19 23:09:43 2011 +0200 (2011-05-19)
branch1.11
changeset 2465 5f98b7a90fbc
permissions -rw-r--r--
complibs/ppl: fix 0.11-0.11.2 to compile with --disable-shared

PPL 0.11 (through 0.11.2) had a small bug where it still tried to build
and test its Java interface even when shared libraries are disabled.
Since that's exactly what ct-ng does, it explodes.

This is the patch from the PPL authors (see final link below).

More information can be found in these messages/threads:

Anthony's initial report and analysis with Yann:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00046.html

Ron Flory hit the same problem:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00054.html

Anthony's report to the ppl-devel list:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017450.html

Roberto's reply with a link to the fix in the PPL git repo:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017455.html

Signed-Off-By: Anthony Foiani <anthony.foiani@gmail.com>
(transplanted from 139b85d70b623e51f7585e7c64ecb8c6a6cf4567) 
     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