[flint] 02/02: Apply undef_count_leading_zeros.patch.

[Tobias Hansen]

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

thansen pushed a commit to branch master
in repository flint.

commit ea5ef969c9e157f2f8bcaecba00c460cea42d52d
Author: Tobias Hansen <thansen at debian.org>
Date:   Wed Dec 21 00:42:06 2016 +0000

    Apply undef_count_leading_zeros.patch.
---
 debian/changelog                               |  8 ++++++++
 debian/patches/series                          |  1 +
 debian/patches/undef_count_leading_zeros.patch | 21 +++++++++++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5dcd0c3..3ca0765 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+flint (2.5.2-14) unstable; urgency=medium
+
+  * Team upload.
+  * New patch undef_count_leading_zeros.patch:
+    Avoid problems when using flint together with givaro. (Closes: #848899)
+
+ -- Tobias Hansen <thansen at debian.org>  Wed, 21 Dec 2016 00:34:03 +0000
+
 flint (2.5.2-13) unstable; urgency=medium
 
   * Re-enable all hardenings since it wasn't the problem.
diff --git a/debian/patches/series b/debian/patches/series
index 841e533..41f4f0c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 hurd
 use_clz_builtins_for_mips.patch
 PIE-FTBFS.patch
+undef_count_leading_zeros.patch
diff --git a/debian/patches/undef_count_leading_zeros.patch b/debian/patches/undef_count_leading_zeros.patch
new file mode 100644
index 0000000..dc00893
--- /dev/null
+++ b/debian/patches/undef_count_leading_zeros.patch
@@ -0,0 +1,21 @@
+Description: Undefine count_leading_zeros and count_trailing_zeros in lonlong.h
+ The fallbacks at the end of the file are only defined when there is no
+ definition yet. When building SageMath it can happen that the symbols are already
+ defined in a givaro header. That lead to build failures on architectures that
+ are supposed to use the fallback here, like arm64 and ppc64el.
+Author: Tobias Hansen <thansen at debian.org>
+
+--- a/longlong.h
++++ b/longlong.h
+@@ -32,6 +32,11 @@
+  extern "C" {
+ #endif
+ 
++/* Undefine to make the ifndef logic below for the fallback 
++   work even if the symbols are already defined (e.g. by givaro).  */
++#undef count_leading_zeros
++#undef count_trailing_zeros
++
+ /* x86 : 64 bit */
+ #if (GMP_LIMB_BITS == 64 && defined (__amd64__)) 
+ 

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