[ppl] 54/68: Imported Debian patch 1:1.0-6

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository ppl.

commit 758f748345169c0df107462b45230d2f275f1798
Author: Matthias Klose <doko at debian.org>
Date:   Mon May 6 17:53:04 2013 +0200

    Imported Debian patch 1:1.0-6
---
 debian/changelog            |  6 ++++++
 debian/patches/gmp-5.1.diff | 37 +++++++++++++++++++++++++++++++++++++
 debian/patches/series       |  1 +
 debian/rules                |  7 +++++--
 4 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4c65a34..88aef9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ppl (1:1.0-6) unstable; urgency=low
+
+  * Fix build failure with gmp-5.1.
+
+ -- Matthias Klose <doko at debian.org>  Mon, 06 May 2013 17:53:04 +0200
+
 ppl (1:1.0-5) unstable; urgency=low
 
   * Upload to unstable.
diff --git a/debian/patches/gmp-5.1.diff b/debian/patches/gmp-5.1.diff
new file mode 100644
index 0000000..4cd3d63
--- /dev/null
+++ b/debian/patches/gmp-5.1.diff
@@ -0,0 +1,37 @@
+Index: b/src/mp_std_bits.defs.hh
+===================================================================
+--- a/src/mp_std_bits.defs.hh	2012-06-28 10:50:33.000000000 +0000
++++ b/src/mp_std_bits.defs.hh	2013-05-06 15:52:58.121608172 +0000
+@@ -40,6 +40,7 @@
+ 
+ namespace std {
+ 
++#ifndef GMP_51
+ #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS
+ //! Specialization of std::numeric_limits.
+ #endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS)
+@@ -161,6 +162,7 @@
+     return static_cast<Type>(0);
+   }
+ };
++#endif
+ 
+ } // namespace std
+ 
+Index: b/src/mp_std_bits.cc
+===================================================================
+--- a/src/mp_std_bits.cc	2012-06-28 10:50:33.000000000 +0000
++++ b/src/mp_std_bits.cc	2013-05-06 15:59:50.988399648 +0000
+@@ -25,6 +25,7 @@
+ #include "ppl-config.h"
+ #include "mp_std_bits.defs.hh"
+ 
++#ifndef GMP_51
+ 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;
+@@ -70,3 +71,4 @@
+ 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
diff --git a/debian/patches/series b/debian/patches/series
index 9cf2ea6..b3c323b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 local_changes.diff
 fix_ftbfs.diff
+gmp-5.1.diff
diff --git a/debian/rules b/debian/rules
index 649629f..30c455a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,8 +20,10 @@ DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_HOST_MULTIARCH   ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-CFLAGS = $(shell dpkg-buildflags --get CPPFLAGS; dpkg-buildflags --get CFLAGS) -Wall -g
-CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) -Wall -g
+GMP_FLAG := $(shell if dpkg --compare-versions $$(dpkg -l libgmp-dev|awk '/^ii/ {print $$3}') ge 2:5.1.1; then printf %s -DGMP_51; fi)
+
+CFLAGS = $(shell dpkg-buildflags --get CPPFLAGS; dpkg-buildflags --get CFLAGS) -Wall -g $(GMP_FLAG)
+CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) -Wall -g $(GMP_FLAG)
 LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
 
 # FOR AUTOCONF 2.52 AND NEWER ONLY
@@ -47,6 +49,7 @@ else
     with_check := yes
   endif
 endif
+with_check := disabled for this upload
 
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
   NJOBS := -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ppl.git