[PATCH 1/3] patch: fix PPL build with GMP 5.x.x

[Arnaud Lacombe <lacombar at gmail dot com>]

>From http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=9c19bc2b318a35016e0189f9552c98910be37f53

Author: Roberto Bagnara <bagnara@cs.unipr.it>
Revision log: Added support for GMP 5.0.

Adapted manually to match and not having to re-generate the configure script.

Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
---
 .../0.10.2/100-fix-configure-with-gmp-5_0_1.patch  |   28 ++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)
 create mode 100644 patches/ppl/0.10.2/100-fix-configure-with-gmp-5_0_1.patch

diff --git a/patches/ppl/0.10.2/100-fix-configure-with-gmp-5_0_1.patch b/patches/ppl/0.10.2/100-fix-configure-with-gmp-5_0_1.patch
new file mode 100644
index 0000000..ab23ee9
--- /dev/null
+++ b/patches/ppl/0.10.2/100-fix-configure-with-gmp-5_0_1.patch
@@ -0,0 +1,28 @@
+--- ppl-0.10.2/configure.orig	2010-08-04 21:48:19.000000000 -0400
++++ ppl-0.10.2/configure	2010-08-04 21:50:04.000000000 -0400
+@@ -16443,6 +16443,10 @@
+ #GMP version 4.1.3 or higher is required
+ #endif
+ 
++#ifndef BITS_PER_MP_LIMB
++#define BITS_PER_MP_LIMB GMP_LIMB_BITS
++#endif
++
+ int
+ main() {
+   std::string header_version;
+@@ -16469,11 +16473,11 @@
+     return 1;
+   }
+ 
+-  if (sizeof(mp_limb_t)*CHAR_BIT != GMP_LIMB_BITS
+-      || GMP_LIMB_BITS != mp_bits_per_limb) {
++  if (sizeof(mp_limb_t)*CHAR_BIT != BITS_PER_MP_LIMB
++      || BITS_PER_MP_LIMB != mp_bits_per_limb) {
+     std::cerr
+       << "GMP header (gmp.h) and library (ligmp.*) bits-per-limb mismatch:\n"
+-      << "header gives " << __GMP_BITS_PER_MP_LIMB << ";\n"
++      << "header gives " << BITS_PER_MP_LIMB << ";\n"
+       << "library gives " << mp_bits_per_limb << ".\n"
+       << "This probably means you are on a bi-arch system and\n"
+       << "you are compiling with the wrong header or linking with\n"
-- 
1.7.1.369.g500b2


--
For unsubscribe information see http://sourceware.org/lists.html#faq