[med-svn] [snap-aligner] 01/01: add URL to upstream pull request & add support for kfreebsd & non-x86

[Michael Crusoe]

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

misterc-guest pushed a commit to branch master
in repository snap-aligner.

commit 945983c494ca1e949dad48bc183609d926253a95
Author: Michael R. Crusoe <crusoe at ucdavis.edu>
Date:   Sun Jan 24 06:19:41 2016 -0800

    add URL to upstream pull request & add support for kfreebsd & non-x86
---
 debian/changelog                    |  9 +++++++++
 debian/patches/drop-msse            |  1 +
 debian/patches/non-x86-and-kfreebsd | 26 ++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 4 files changed, 37 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 41919ab..e1a4464 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+snap-aligner (0.18~1.0~beta.18+dfsg1-3) UNRELEASED; urgency=medium
+
+  * Add support for kfreebsd and non-x86, thanks to Aaron M. Ucko
+    <ucko at debian.org> (Closes: #812551, #812550)
+  * Drop attempt at 32-bit compatability, as per upstream we need >4GB memory
+    space for real uses of this tool.
+
+ -- Michael R. Crusoe <crusoe at ucdavis.edu>  Mon, 25 Jan 2016 00:06:51 -0800
+
 snap-aligner (0.18~1.0~beta.18+dfsg1-2) unstable; urgency=medium
 
   * Drop -msse flag for wider platform compatibility
diff --git a/debian/patches/drop-msse b/debian/patches/drop-msse
index 5159587..63f5362 100644
--- a/debian/patches/drop-msse
+++ b/debian/patches/drop-msse
@@ -1,6 +1,7 @@
 Author: Michael R. Crusoe
 Description: drop SSE flag, not needed for AMD64 and x32 and limits portability
 according to Aaron M. Ucko <ucko at debian.org>
+Forwarded: https://github.com/amplab/snap/pull/67
 --- snap-aligner.orig/Makefile
 +++ snap-aligner/Makefile
 @@ -2,7 +2,7 @@
diff --git a/debian/patches/non-x86-and-kfreebsd b/debian/patches/non-x86-and-kfreebsd
new file mode 100644
index 0000000..4922804
--- /dev/null
+++ b/debian/patches/non-x86-and-kfreebsd
@@ -0,0 +1,26 @@
+Description: Uses more liberal CPP defines to add compatability to kfreebsd &
+non-x86 systems
+Author: Michael R. Crusoe <crusoe at ucdavis.edu> and Aaron M. Ucko
+ <ucko at debian.org>
+--- snap-aligner.orig/SNAPLib/Compat.cpp
++++ snap-aligner/SNAPLib/Compat.cpp
+@@ -1015,7 +1015,7 @@
+ _int64 timeInNanos()
+ {
+     timespec ts;
+-#if defined(__linux__)
++#if defined(_POSIX_TIMERS)  &&  _POSIX_TIMERS > 0
+     clock_gettime(CLOCK_REALTIME, &ts); // Works on Linux
+ #elif defined(__MACH__)
+     clock_serv_t cclock;
+--- snap-aligner.orig/SNAPLib/Compat.h
++++ snap-aligner/SNAPLib/Compat.h
+@@ -82,7 +82,7 @@
+ #include <sched.h>  // For sched_setaffinity
+ #endif
+ 
+-#ifndef __APPLE__
++#if defined(__SSE__)  &&  !defined(__APPLE__)
+ #include <xmmintrin.h>  // This is currently (in Dec 2013) broken on Mac OS X 10.9 (Apple clang-500.2.79)
+ #else
+ #define _mm_prefetch(...) {}
diff --git a/debian/patches/series b/debian/patches/series
index d90f929..a163ee1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+non-x86-and-kfreebsd
 drop-msse
 spelling
 finish-rename

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