patches/ppl/0.10.2/100-fix-configure-with-gmp-5_0_1.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Tue Oct 16 20:57:44 2012 +0200 (2012-10-16)
changeset 3079 37831a33e07e
permissions -rw-r--r--
kernel/linux: fix using custom location

Currently, extract and patch are skipped as thus:
- using a custom directory of pre-installed headers
- a correctly named directory already exists

Otherwise, extract and patch are done.

The current second condition is wrong, because it allows the following
sequence to happen:
- a non-custom kernel is used
- a previous build only partially extracted the non-custom sources
- that p[revious build broke during extraction (eg. incomplete tarball...)
- a subsequent build will find a properly named directory, and will
thus skip extract and patch, which is wrong

Fix that by following the conditions in this table:

Type | Extract | Patch
----------------------+---------+-------
Pre-installed headers | N | N
custom directory | N | N
custom tarball | Y | N
mainstream tarball | Y | Y

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: David Holsgrove <david.holsgrove@xilinx.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"