[Debian-astro-commits] [gyoto] 01/01: gyoto (1.1.1-3) unstable; urgency=medium

[Thibaut Jean-Claude Paumard]

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

thibaut pushed a commit to branch debian
in repository gyoto.

commit dd3c5faa4acd1db75f9ef029b9b74efb6aa16255
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date:   Fri Nov 18 09:20:34 2016 +0100

    gyoto (1.1.1-3) unstable; urgency=medium
    
      * Bug fix: "FTBFS with boost1.62" (Closes: #844490).
    
     -- Thibaut Paumard <thibaut at debian.org>  Thu, 17 Nov 2016 22:29:08 +0100
---
 debian/changelog                       |  6 ++++++
 debian/patches/acos-locking-workaround | 28 ++++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 debian/rules                           |  4 ++++
 4 files changed, 39 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a68ef42..5b1e5b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gyoto (1.1.1-3) unstable; urgency=medium
+
+  * Bug fix: "FTBFS with boost1.62" (Closes: #844490).
+
+ -- Thibaut Paumard <thibaut at debian.org>  Thu, 17 Nov 2016 22:29:08 +0100
+
 gyoto (1.1.1-2) unstable; urgency=low
 
   * The gyoto meta-package depends on the corresponding version of
diff --git a/debian/patches/acos-locking-workaround b/debian/patches/acos-locking-workaround
new file mode 100644
index 0000000..e6b6680
--- /dev/null
+++ b/debian/patches/acos-locking-workaround
@@ -0,0 +1,28 @@
+Description: work around Boost.multiprecision acos() locking
+ Since boost1.62, acos() locks in Screen.C on some architectures when
+ delta100 is 0. Single-case this.
+Author: Thibaut Paumard
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=844490
+Forwarded: yes
+Last-Update: 2016-11-17
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/lib/Screen.C
++++ b/lib/Screen.C
+@@ -561,6 +561,15 @@
+ 
+ #ifdef HAVE_BOOST_MULTIPRECISION_CPP_DEC_FLOAT_HPP
+     // using boost multiprecision to avoid information loss in trigonometry
++# ifdef GYOTO_ACOS_LOCKING_WORKAROUND
++    if (delta==0) {
++      spherical_angle_a=abs(alpha);
++      spherical_angle_b=0.;
++    } else if (alpha==0) {
++      spherical_angle_a=abs(delta);
++      spherical_angle_b=((delta >= 0) - (delta < 0))*M_PI*0.5;
++    } else
++# endif
+     {
+       boost::multiprecision::cpp_dec_float_100
+ 	alpha100=alpha, delta100=delta, a, b;
diff --git a/debian/patches/series b/debian/patches/series
index b8c491c..2746fff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 interpreter-path
+acos-locking-workaround
diff --git a/debian/rules b/debian/rules
index 083e6b4..d0c3d8d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,10 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
 DPKG_EXPORT_BUILDFLAGS = 1
 -include /usr/share/dpkg/buildflags.mk
 
+ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 mips64el ppc64el s390x powerpc ppc64))
+CPPFLAGS += -DGYOTO_ACOS_LOCKING_WORKAROUND
+endif
+
 # Don't accidentally build the lorene plug-in
 unexport HOME_LORENE
 

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