[cdo] 03/16: Workaround for hppa FTBFS (GCC ICE). Closes: #790393.

[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 f7d7e8aca9c087d783709416e9d4b175aa76a66e
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Mar 20 16:05:27 2016 +0000

    Workaround for hppa FTBFS (GCC ICE). Closes: #790393.
---
 debian/changelog                   |  1 +
 debian/patches/hppa_gomp_bug.patch | 29 +++++++++++++++++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8f65a8f..887e052 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ cdo (1.7.0+dfsg.1-4) UNRELEASED; urgency=medium
 
   * Enable CMOR support.
   * Bugfix for FTBFS with libc 2.23. Closes: #818826.
+  * Workaround for hppa FTBFS (GCC ICE). Closes: #790393.
 
  -- Alastair McKinstry <mckinstry at debian.org>  Sun, 20 Mar 2016 15:37:34 +0000
 
diff --git a/debian/patches/hppa_gomp_bug.patch b/debian/patches/hppa_gomp_bug.patch
new file mode 100644
index 0000000..4cf7ba3
--- /dev/null
+++ b/debian/patches/hppa_gomp_bug.patch
@@ -0,0 +1,29 @@
+Author: John David Anglin <dave.anglin at bell.net>
+Description: Workaround for GCC ICE 
+ This bug is GCC PR middle-end/68733:
+ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68733
+ .
+ The issue arises because structs larger than 64 bytes are passed by invisible reference and
+ the callee is responsible for copying.
+Bug-Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=790393
+Last-Updated: 2016-03-21
+Forwarded: no
+
+--- cdo-1.7.0+dfsg.1.orig/src/remaplib.c
++++ cdo-1.7.0+dfsg.1/src/remaplib.c
+@@ -1573,13 +1573,14 @@ void remap_stat(int remap_order, remapgr
+ 
+ /*****************************************************************************/
+ 
+-void remap_gradients(remapgrid_t grid, const double *restrict array, double *restrict grad_lat,
++void remap_gradients(remapgrid_t grid_arg, const double *restrict array, double *restrict grad_lat,
+ 		     double *restrict grad_lon, double *restrict grad_latlon)
+ {
+   long nx, ny, grid_size;
+   long i, j, ip1, im1, jp1, jm1, in, is, ie, iw, ine, inw, ise, isw;
+   double delew, delns;
+   double grad_lat_zero, grad_lon_zero;
++  remapgrid_t grid = grid_arg;
+ 
+   if ( grid.rank != 2 )
+     cdoAbort("Internal problem (remap_gradients), grid rank = %d!", grid.rank);
diff --git a/debian/patches/series b/debian/patches/series
index 23113d5..5ec1e0f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ deregister.patch
 reproducible-builds.patch
 ppc64el.patch
 libc-2.23-fixes.patch
+hppa_gomp_bug.patch

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