[cdo] 02/16: Bugfix for FTBFS with libc 2.23. Closes: #818826.

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository cdo.

commit 0d3399cb27afb4ec9f17232b492842d1f3382b0d
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Mar 20 15:56:45 2016 +0000

    Bugfix for FTBFS with libc 2.23. Closes: #818826.
---
 debian/changelog                     |  1 +
 debian/patches/libc-2.23-fixes.patch | 37 ++++++++++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 3 files changed, 39 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 26f15ca..8f65a8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 cdo (1.7.0+dfsg.1-4) UNRELEASED; urgency=medium
 
   * Enable CMOR support.
+  * Bugfix for FTBFS with libc 2.23. Closes: #818826.
 
  -- Alastair McKinstry <mckinstry at debian.org>  Sun, 20 Mar 2016 15:37:34 +0000
 
diff --git a/debian/patches/libc-2.23-fixes.patch b/debian/patches/libc-2.23-fixes.patch
new file mode 100644
index 0000000..b20f72f
--- /dev/null
+++ b/debian/patches/libc-2.23-fixes.patch
@@ -0,0 +1,37 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Fix for isnan() conversion errors with libcc 2.23
+Forwarded: no
+Last-Updated: 2016-03-21
+Bug-Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=818826
+
+Index: cdo-1.7.0+dfsg.1/src/EOFs.c
+===================================================================
+--- cdo-1.7.0+dfsg.1.orig/src/EOFs.c
++++ cdo-1.7.0+dfsg.1/src/EOFs.c
+@@ -181,7 +181,7 @@ void *EOFs(void * argument)
+   juldate_t juldate;
+ 
+   double sum;
+-  double missval = 0;
++  double missval = 0.0;
+   double xvals, yvals;
+ 
+   typedef struct {
+@@ -377,7 +377,7 @@ void *EOFs(void * argument)
+ 	      npack = 0;
+ 	      for ( i = 0; i < gridsize; ++i )
+ 		{
+-		  if ( !DBL_IS_EQUAL(weight[i], 0) && !DBL_IS_EQUAL(weight[i], missval) &&
++		  if ( !DBL_IS_EQUAL(weight[i], 0.0) && !DBL_IS_EQUAL(weight[i], missval) &&
+ 		       !DBL_IS_EQUAL(in[i], missval) )
+ 		    pack[npack++] = i;
+ 		}
+@@ -392,7 +392,7 @@ void *EOFs(void * argument)
+ 	  ipack = 0;
+ 	  for ( i = 0; i < gridsize; ++i )
+ 	    {
+-	      if ( !DBL_IS_EQUAL(weight[i], 0) && !DBL_IS_EQUAL(weight[i], missval) &&
++	      if ( !DBL_IS_EQUAL(weight[i], 0.0) && !DBL_IS_EQUAL(weight[i], missval) &&
+ 		   !DBL_IS_EQUAL(in[i], missval) && pack[ipack++] != i )
+ 		{
+ 		  cdoAbort("Missing values unsupported!");
diff --git a/debian/patches/series b/debian/patches/series
index 19eeeba..23113d5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ gotocc-fix.patch
 deregister.patch
 reproducible-builds.patch
 ppc64el.patch
+libc-2.23-fixes.patch

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