Fix build with gmp-5.1.0.

From
http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git
via
https://raw.github.com/niXman/mingw-builds/master/patches/ppl/ppl-resolve-conflicts-with-gmp-5.1.0.patch

3 files changed, 68 insertions, 1 deletions

diff --git a/math/ppl/distinfo b/math/ppl/distinfo
index 27ad19f3ad9..5e2d78ecd38 100644
--- a/math/ppl/distinfo
+++ b/math/ppl/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2012/04/08 20:52:32 wiz Exp $
+$NetBSD: distinfo,v 1.2 2013/02/09 21:29:24 wiz Exp $
 
 SHA1 (ppl-0.11.2.tar.gz) = f3fe00f14983d6abcd1d4d886d340af04a974dfa
 RMD160 (ppl-0.11.2.tar.gz) = 953717be0b3ca9f8a1e2e61b2025fdb0c16e02e5
 Size (ppl-0.11.2.tar.gz) = 13741905 bytes
+SHA1 (patch-src_mp__std__bits.cc) = d1ddd67269fab7e3584565c43fc2d0ae8111d4c7
+SHA1 (patch-src_mp__std__bits.defs.hh) = 6e627fb09898e0071903b53ecd92ff01a27951f8
diff --git a/math/ppl/patches/patch-src_mp__std__bits.cc b/math/ppl/patches/patch-src_mp__std__bits.cc
new file mode 100644
index 00000000000..af5c6bd6a10
--- /dev/null
+++ b/math/ppl/patches/patch-src_mp__std__bits.cc
@@ -0,0 +1,31 @@
+$NetBSD: patch-src_mp__std__bits.cc,v 1.1 2013/02/09 21:29:24 wiz Exp $
+
+Module: ppl/ppl
+Branch: master
+Commit: 9f843aecc23981aec6ed1eaa8be06e6786a47f0d
+URL:    http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9f843aecc23981aec6ed1eaa8be06e6786a47f0d
+
+Author: Roberto Bagnara <bagnara at cs.unipr.it>
+Date:   Wed Dec 19 08:42:19 2012 +0100
+
+GMP version 5.1.0 (and, presumably, later versions) defines std::numeric_limits.
+
+--- src/mp_std_bits.cc.orig	2011-02-27 09:07:47.000000000 +0000
++++ src/mp_std_bits.cc
+@@ -26,6 +26,9 @@ site: http://www.cs.unipr.it/ppl/ . */
+ #include <ppl-config.h>
+ #include "mp_std_bits.defs.hh"
+ 
++#if __GNU_MP_VERSION < 5 \
++  || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
++
+ const bool std::numeric_limits<mpz_class>::is_specialized;
+ const int std::numeric_limits<mpz_class>::digits;
+ const int std::numeric_limits<mpz_class>::digits10;
+@@ -71,3 +74,6 @@ const bool std::numeric_limits<mpq_class
+ const bool std::numeric_limits<mpq_class>::traps;
+ const bool std::numeric_limits<mpq_class>::tininess_before;
+ const std::float_round_style std::numeric_limits<mpq_class>::round_style;
++
++#endif // __GNU_MP_VERSION < 5
++       // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
diff --git a/math/ppl/patches/patch-src_mp__std__bits.defs.hh b/math/ppl/patches/patch-src_mp__std__bits.defs.hh
new file mode 100644
index 00000000000..067066aafa0
--- /dev/null
+++ b/math/ppl/patches/patch-src_mp__std__bits.defs.hh
@@ -0,0 +1,34 @@
+$NetBSD: patch-src_mp__std__bits.defs.hh,v 1.1 2013/02/09 21:29:24 wiz Exp $
+
+Module: ppl/ppl
+Branch: master
+Commit: 9f843aecc23981aec6ed1eaa8be06e6786a47f0d
+URL:    http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9f843aecc23981aec6ed1eaa8be06e6786a47f0d
+
+Author: Roberto Bagnara <bagnara at cs.unipr.it>
+Date:   Wed Dec 19 08:42:19 2012 +0100
+
+GMP version 5.1.0 (and, presumably, later versions) defines std::numeric_limits.
+
+--- src/mp_std_bits.defs.hh.orig	2011-02-27 09:07:47.000000000 +0000
++++ src/mp_std_bits.defs.hh
+@@ -39,6 +39,9 @@ void swap(mpz_class& x, mpz_class& y);
+ #endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS)
+ void swap(mpq_class& x, mpq_class& y);
+ 
++#if __GNU_MP_VERSION < 5 \
++  || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
++
+ namespace std {
+ 
+ #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS
+@@ -165,6 +168,9 @@ public:
+ 
+ } // namespace std
+ 
++#endif // __GNU_MP_VERSION < 5
++       // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
++
+ #include "mp_std_bits.inlines.hh"
+ 
+ #endif // !defined(PPL_mp_std_bits_defs_hh)