* [PATCH] complibs/ppl: Fix build of ppl 0.11.2 with gmp 5.1 and later
@ 2013-12-08 11:58 Bernhard Walle
2013-12-12 22:09 ` Yann E. MORIN
0 siblings, 1 reply; 2+ messages in thread
From: Bernhard Walle @ 2013-12-08 11:58 UTC (permalink / raw)
To: yann.morin.1998; +Cc: crossgcc
# HG changeset patch
# User Bernhard Walle <bernhard@bwalle.de>
# Date 1386503594 -3600
# Sun Dec 08 12:53:14 2013 +0100
# Node ID 9a012bed87b494cfe0d4e06b828d522c562b8765
# Parent 7e569a9cb5fd3ab591bb307328b947a5b7312cba
complibs/ppl: Fix build of ppl 0.11.2 with gmp 5.1 and later
The fix is backported from
http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=9f843aecc23981aec6ed1eaa8be06e6786a47f0d.
Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
diff -r 7e569a9cb5fd -r 9a012bed87b4 patches/ppl/0.11.2/400-fix-build-with-gmp-5.1.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ppl/0.11.2/400-fix-build-with-gmp-5.1.patch Sun Dec 08 12:53:14 2013 +0100
@@ -0,0 +1,52 @@
+From 9f843aecc23981aec6ed1eaa8be06e6786a47f0d Mon Sep 17 00:00:00 2001
+From: Roberto Bagnara <bagnara@cs.unipr.it>
+Date: Wed, 19 Dec 2012 08:42:19 +0100
+Subject: [PATCH] GMP version 5.1.0 (and, presumably, later versions) defines
+ std::numeric_limits.
+
+---
+ src/mp_std_bits.cc | 6 ++++++
+ src/mp_std_bits.defs.hh | 6 ++++++
+ 2 files changed, 12 insertions(+)
+
+--- a/src/mp_std_bits.cc
++++ b/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)
+--- a/src/mp_std_bits.defs.hh
++++ b/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)
--
For unsubscribe information see http://sourceware.org/lists.html#faq
^ permalink raw reply [flat|nested] 2+ messages in thread
* complibs/ppl: Fix build of ppl 0.11.2 with gmp 5.1 and later
2013-12-08 11:58 [PATCH] complibs/ppl: Fix build of ppl 0.11.2 with gmp 5.1 and later Bernhard Walle
@ 2013-12-12 22:09 ` Yann E. MORIN
0 siblings, 0 replies; 2+ messages in thread
From: Yann E. MORIN @ 2013-12-12 22:09 UTC (permalink / raw)
To: Bernhard Walle; +Cc: crossgcc
Bernhard, All,
Your patch:
complibs/ppl: Fix build of ppl 0.11.2 with gmp 5.1 and later
has been applied as: #15c6976026f3
http://crosstool-ng.org/hg/crosstool-ng/rev/15c6976026f3
Thank you!
Regards,
Yann E. MORIN.
--
For unsubscribe information see http://sourceware.org/lists.html#faq
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-12-12 22:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-12-08 11:58 [PATCH] complibs/ppl: Fix build of ppl 0.11.2 with gmp 5.1 and later Bernhard Walle
2013-12-12 22:09 ` Yann E. MORIN
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).