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

johanvdw-guest pushed a commit to branch experimental
in repository hdf4.

commit 2b9ee083aa7915dffc758e2e7e5befb73fa06302
Author: Johan Van de Wauw <johan.vandew...@gmail.com>
Date:   Tue Mar 10 21:02:45 2015 +0100

    Fix mips64el build
    
    Conflicts:
        debian/changelog
        debian/patches/series
---
 debian/changelog              |  3 +++
 debian/patches/mips64el.patch | 15 +++++++++++++++
 debian/patches/series         |  1 +
 3 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 43be2d7..9c60541 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 libhdf4 (4.2.11-1~exp) UNRELEASED; urgency=medium
 
   * Import new upstream release 4.2.11
+  * Remove HDF4 dir content, added in nmu
+  * Remove suggests for old package
+  * Add mips64el patch by James Cowgill (closes: #779624)
 
  -- Johan Van de Wauw <johan.vandew...@gmail.com>  Sat, 14 Feb 2015 13:43:51 
+0100
 
diff --git a/debian/patches/mips64el.patch b/debian/patches/mips64el.patch
new file mode 100644
index 0000000..433d187
--- /dev/null
+++ b/debian/patches/mips64el.patch
@@ -0,0 +1,15 @@
+--- a/mfhdf/libsrc/xdrposix.c
++++ b/mfhdf/libsrc/xdrposix.c
+@@ -283,12 +283,6 @@ static void xdrposix_destroy();
+ static struct xdr_ops   xdrposix_ops = {
+     xdrposix_getlong,   /* deserialize a 32-bit int */
+     xdrposix_putlong,   /* serialize a 32-bit int */
+-#if (_MIPS_SZLONG == 64)
+-    /* IRIX64 has 64 bits long and 32 bits int. */
+-    /* It defines two extra entries for get/put int. */
+-    xdrposix_getint,   /* deserialize a 32-bit int */
+-    xdrposix_putint,   /* serialize a 32-bit int */
+-#endif
+     xdrposix_getbytes,  /* deserialize counted bytes */
+     xdrposix_putbytes,  /* serialize counted bytes */
+     xdrposix_getpos,    /* get offset in the stream */
diff --git a/debian/patches/series b/debian/patches/series
index 6507f6e..98e6af7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ install-examples.diff
 missing-includes.diff
 ppc64el.patch
 enablesharedfortran.diff
+mips64el.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/hdf4.git

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to