summaryrefslogtreecommitdiff
path: root/p/haskell-clock/debian
diff options
context:
space:
mode:
authorJoachim Breitner <mail@joachim-breitner.de>2015-05-07 22:09:11 +0300
committerJoachim Breitner <mail@joachim-breitner.de>2015-05-07 22:09:11 +0300
commite651c188c67ddcd6314142c05015a407b84f9a10 (patch)
treeb4ac756d141977a9e1d9e85824b4d0848a2841a2 /p/haskell-clock/debian
parent4ff67dba16b24067258527c82db1a989046f7f4f (diff)
downloadDHG_packages-e651c188c67ddcd6314142c05015a407b84f9a10.tar.gz
haskell-clock: Hurd compat patch by Pino Toscano (Closes: #784685)
Diffstat (limited to 'p/haskell-clock/debian')
-rw-r--r--p/haskell-clock/debian/changelog6
-rw-r--r--p/haskell-clock/debian/patches/hurd.diff29
-rw-r--r--p/haskell-clock/debian/patches/series1
3 files changed, 36 insertions, 0 deletions
diff --git a/p/haskell-clock/debian/changelog b/p/haskell-clock/debian/changelog
index 304b2593e..97d5c0bc6 100644
--- a/p/haskell-clock/debian/changelog
+++ b/p/haskell-clock/debian/changelog
@@ -1,3 +1,9 @@
+haskell-clock (0.4.1.3-3) UNRELEASED; urgency=medium
+
+ * Hurd compat patch by Pino Toscano (Closes: #784685)
+
+ -- Joachim Breitner <nomeata@debian.org> Thu, 07 May 2015 21:08:44 +0200
+
haskell-clock (0.4.1.3-2) unstable; urgency=medium
* Upload to unstable
diff --git a/p/haskell-clock/debian/patches/hurd.diff b/p/haskell-clock/debian/patches/hurd.diff
new file mode 100644
index 000000000..751782f01
--- /dev/null
+++ b/p/haskell-clock/debian/patches/hurd.diff
@@ -0,0 +1,29 @@
+--- a/csec/clock.c
++++ b/csec/clock.c
+@@ -119,7 +119,7 @@ void clock_readres_threadtime(long* t)
+ // ***********************
+
+ #include <time.h>
+-#ifdef __MACH__
++#if defined(__MACH__) && defined(__APPLE__)
+ #include <mach/clock.h>
+ #include <mach/mach.h>
+ #define CLOCK_ID_T clock_id_t
+@@ -138,7 +138,7 @@ void clock_readres_threadtime(long* t)
+
+ void time_(CLOCK_ID_T clock, long* t)
+ {
+- #ifdef __MACH__
++ #if defined(__MACH__) && defined(__APPLE__)
+ // OS X does not have clock_gettime, use clock_get_time
+ // see http://stackoverflow.com/questions/11680461/monotonic-clock-on-osx
+ clock_serv_t cclock;
+@@ -188,7 +188,7 @@ void clock_readtime_threadtime(long* t)
+
+ void res_(CLOCK_ID_T clock, long* t)
+ {
+- #ifdef __MACH__
++ #if defined(__MACH__) && defined(__APPLE__)
+ clock_serv_t cclock;
+ int nsecs;
+ mach_msg_type_number_t count;
diff --git a/p/haskell-clock/debian/patches/series b/p/haskell-clock/debian/patches/series
new file mode 100644
index 000000000..38aa8a2d2
--- /dev/null
+++ b/p/haskell-clock/debian/patches/series
@@ -0,0 +1 @@
+hurd.diff