Mercurialcrosstool-ng / annotate
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:06:16 2011 +0200 (2011-05-19)
changeset 2461 ec30b191f0e3
permissions -rw-r--r--
complibs/ppl: build only C and C++ interfaces for PPL

By default, PPL wants to build interfaces for any of a variety of
langauges it finds on the local host (python, java, possibly perl, also
more esoteric languages such as ocaml and prolog).

These extra interfaces can double the compile time for the library. For
single-process builds, I found a savings of more than 40%:

default / j1: 716s total, 143.2s avg, 0.52s stdev
just_c / j1: 406s total, 81.2s avg, 0.33s stdev
just_c_cpp / j1: 413s total, 82.6s avg, 0.22s stdev

And for multi-process builds, it approached 50%:

default / j4: 625s total, 125.0s avg, 0.57s stdev
just_c / j4: 338s total, 67.6s avg, 1.25s stdev
just_c_cpp / j4: 327s total, 65.4s avg, 0.36s stdev

Since the PPL we build within ct-ng is only used by GCC, we only need to
build the C and C++ interfaces.

Signed-Off-By: Anthony Foiani <anthony.foiani@gmail.com>
lacombar@2067 
     1
 
--- ppl-0.10.2/configure.orig	2010-08-04 21:48:19.000000000 -0400
lacombar@2067 
     2
 
+++ ppl-0.10.2/configure	2010-08-04 21:50:04.000000000 -0400
lacombar@2067 
     3
 
@@ -16443,6 +16443,10 @@
lacombar@2067 
     4
 
 #GMP version 4.1.3 or higher is required
lacombar@2067 
     5
 
 #endif
lacombar@2067 
     6
lacombar@2067 
     7
 
+#ifndef BITS_PER_MP_LIMB
lacombar@2067 
     8
 
+#define BITS_PER_MP_LIMB GMP_LIMB_BITS
lacombar@2067 
     9
 
+#endif
lacombar@2067 
    10
 
+
lacombar@2067 
    11
 
 int
lacombar@2067 
    12
 
 main() {
lacombar@2067 
    13
 
   std::string header_version;
lacombar@2067 
    14
 
@@ -16469,11 +16473,11 @@
lacombar@2067 
    15
 
     return 1;
lacombar@2067 
    16
 
   }
lacombar@2067 
    17
lacombar@2067 
    18
 
-  if (sizeof(mp_limb_t)*CHAR_BIT != GMP_LIMB_BITS
lacombar@2067 
    19
 
-      || GMP_LIMB_BITS != mp_bits_per_limb) {
lacombar@2067 
    20
 
+  if (sizeof(mp_limb_t)*CHAR_BIT != BITS_PER_MP_LIMB
lacombar@2067 
    21
 
+      || BITS_PER_MP_LIMB != mp_bits_per_limb) {
lacombar@2067 
    22
 
     std::cerr
lacombar@2067 
    23
 
       << "GMP header (gmp.h) and library (ligmp.*) bits-per-limb mismatch:\n"
lacombar@2067 
    24
 
-      << "header gives " << __GMP_BITS_PER_MP_LIMB << ";\n"
lacombar@2067 
    25
 
+      << "header gives " << BITS_PER_MP_LIMB << ";\n"
lacombar@2067 
    26
 
       << "library gives " << mp_bits_per_limb << ".\n"
lacombar@2067 
    27
 
       << "This probably means you are on a bi-arch system and\n"
lacombar@2067 
    28
 
       << "you are compiling with the wrong header or linking with\n"
crosstool-ng