patches/ppl/0.10.2/100-fix-configure-with-gmp-5_0_1.patch
author Willy Tarreau <w@1wt.eu>
Tue Nov 15 19:11:57 2011 +0100 (2011-11-15)
changeset 2751 bd17cca444ae
permissions -rw-r--r--
debug/gdb: fix tic install path, tell ncurses where to find it

ncurses 5.9 wants tic to be either one of:
- $TIC_PATH
- /usr/bin/tic

Of course, se do not want the latter, for it can be incompatible if the
ncurses in the build system is too old (eg. RHEL 5.6, Debian Lenny...).
So, force TIC_PATH to the location of our own tic.

Also, install tic alongside the other build tools, not in a sub-dir
of the toolchain installation dir.

Signed-off-by: Willy Tarreau <w@1wt.eu>
[yann.morin.1998@anciens.enib.fr: install in builtools/bin, move TIC_PATH]
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"