From patchwork Sun Dec 8 11:58:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernhard Walle X-Patchwork-Id: 298789 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id ED5AB2C00CB for ; Sun, 8 Dec 2013 22:58:47 +1100 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:content-type:mime-version :content-transfer-encoding:subject:message-id:date:from:to:cc; q=dns; s=default; b=GpARxOl1X8bHxTNnenfOP2E4sFCUpAlnL5BKs3JZs3U JXzYekd1WbP1uq6xNu3+T+TX1nzJ9itjss+O+fbkSPJoS5RwCVLDk3qWK6uac6cw ieBf3/JzJKLcmKfzr6pLSJYxi0lLndUJGLuVWu9y5XoiCxF0kiy0W3CmDsMKOyno = DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:content-type:mime-version :content-transfer-encoding:subject:message-id:date:from:to:cc; s=default; bh=sK62O/IRYstAxiWke/2R5gw/xF0=; b=tegyxpsk0PKvmMNlE 38gF+DhQUQeVCrNASPQvXLDROpErVNiUOK/MWwT76XSeAoIVUdJrHLyFIa4O3Vx+ ASHesQt41SH7kiTvnOBbQUIUpskLELSsmHW6I5n3mX+iKThxzlhUHB0kT1aejXJ2 sRqq+fzeYPN1QTjI0u19UeE1rE= Received: (qmail 27023 invoked by alias); 8 Dec 2013 11:58:40 -0000 Mailing-List: contact crossgcc-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: crossgcc-owner@sourceware.org Delivered-To: mailing list crossgcc@sourceware.org Received: (qmail 27012 invoked by uid 89); 8 Dec 2013 11:58:39 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.8 required=5.0 tests=BAYES_50, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 X-HELO: smtprelay03.ispgateway.de Received: from Unknown (HELO smtprelay03.ispgateway.de) (80.67.31.41) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Sun, 08 Dec 2013 11:58:37 +0000 Received: from [87.169.247.22] (helo=euler.fritz.box) by smtprelay03.ispgateway.de with esmtpa (Exim 4.68) (envelope-from ) id 1Vpd0F-00031D-MM; Sun, 08 Dec 2013 12:58:27 +0100 MIME-Version: 1.0 Subject: [PATCH] complibs/ppl: Fix build of ppl 0.11.2 with gmp 5.1 and later X-Mercurial-Node: 9a012bed87b494cfe0d4e06b828d522c562b8765 Message-Id: <9a012bed87b494cfe0d4.1386503894@euler.fritz.box> User-Agent: Mercurial-patchbomb/2.8.1 Date: Sun, 08 Dec 2013 12:58:14 +0100 From: Bernhard Walle To: yann.morin.1998@free.fr Cc: crossgcc@sourceware.org X-Df-Sender: MTIyNzgwNg== X-IsSubscribed: yes # HG changeset patch # User Bernhard Walle # 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 --- For unsubscribe information see http://sourceware.org/lists.html#faq 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 +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 + #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::is_specialized; + const int std::numeric_limits::digits; + const int std::numeric_limits::digits10; +@@ -71,3 +74,6 @@ const bool std::numeric_limits::traps; + const bool std::numeric_limits::tininess_before; + const std::float_round_style std::numeric_limits::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)