patches/ppl/0.10.2/100-fix-configure-with-gmp-5_0_1.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Aug 02 18:26:53 2011 +0200 (2011-08-02)
changeset 2592 4908eb2b6f17
permissions -rw-r--r--
scripts/functions: cvs retrieval first tries the mirror for tarballs

The cvs download helper looks for the local tarballs dir to see if it
can find a pre-downloaded tarball, and if it does not find it, does
the actual fetch to upstream via cvs.

In the process, it does not even try to get a tarball from the local
mirror, which can be useful if the mirror has been pre-populated
manually (or with a previously downloaded tree).

Fake a tarball get with the standard tarball-download helper, but
without specifying any upstream URL, which makes the helper directly
try the LAN mirror.

Of course, if no mirror is specified, no URL wil be available, and
the standard cvs retrieval will kick in.

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