[med-svn] [htslib] 01/02: Fix build on hurd

[Andreas Tille]

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

tille pushed a commit to branch debian/unstable
in repository htslib.

commit 86cb62bc3b5adeefd334e59af1d7182c9d3eeb46
Author: Andreas Tille <tille at debian.org>
Date:   Thu Sep 1 10:00:37 2016 +0200

    Fix build on hurd
---
 debian/changelog                     |  8 ++++++++
 debian/patches/define_PATH_MAX.patch | 28 +++++++++++++++++++++-------
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4da8b05..7445288 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+htslib (1.3.1-3) UNRELEASED; urgency=medium
+
+  * Fix build on hurd (thanks for the patch to Svante Signell
+    <svante.signell at gmail.com>)
+    Closes: #836190
+
+ -- Andreas Tille <tille at debian.org>  Thu, 01 Sep 2016 09:59:32 +0200
+
 htslib (1.3.1-2) unstable; urgency=medium
 
   [ Canberk Koç ]
diff --git a/debian/patches/define_PATH_MAX.patch b/debian/patches/define_PATH_MAX.patch
index 116f2f4..5bfd09a 100644
--- a/debian/patches/define_PATH_MAX.patch
+++ b/debian/patches/define_PATH_MAX.patch
@@ -1,14 +1,16 @@
-Author: Andreas Tille <tille at debian.org>
-Last-Uudate: Wed, 09 Dec 2015 16:40:21 +0100
+Author: Andreas Tille <tille at debian.org>,
+        Svante Signell <svante.signell at gmail.com>
+Last-Uudate: Wed, 31 Aug 2016 12:14:45 +0200
 Bug-Debian: https://bugs.debian.org/793512
+            https://bugs.debian.org/836190
 Description: Define PATH_MAX as it is done in cram/open_trace_file.c if
  not existent.  The definition should be removed from this C file since the
  header file affects all three C files where this definition is used.
 
 --- a/cram/os.h
 +++ b/cram/os.h
-@@ -134,6 +134,13 @@ extern "C" {
- #  define SP_BIG_ENDIAN
+@@ -153,6 +153,13 @@ extern "C" {
+ 
  #endif
  
 +/*
@@ -18,6 +20,18 @@ Description: Define PATH_MAX as it is done in cram/open_trace_file.c if
 +#  define PATH_MAX 1024
 +#endif
 +
- /* Some catch-alls */
- #if defined(__LITTLE_ENDIAN__) || defined(__LITTLEENDIAN__)
- #    define SP_LITTLE_ENDIAN
+ /*-----------------------------------------------------------------------------
+  * Allow for unaligned memory access. This is used in BAM code as the packed
+  * structure has 4-byte cigar ints after the variable length name.
+--- a/cram/open_trace_file.c
++++ b/cram/open_trace_file.c
+@@ -72,9 +72,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include "cram/os.h"
+-#ifndef PATH_MAX
+-#  define PATH_MAX 1024
+-#endif
+ 
+ #include "cram/open_trace_file.h"
+ #include "cram/misc.h"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/htslib.git