This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch sid
in repository glibc.
commit d35289fa3bbac19dda3d7992e3d3af36ccb4e07e
Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Date: Thu Jul 14 14:43:32 2016 +0200
Fix ghc 8 build
* hurd-i386/local-clock_gettime_MONOTONIC.diff: Complete patch with
timer_create.
---
debian/changelog | 2 ++
debian/patches/hurd-i386/local-clock_gettime_MONOTONIC.diff | 11 +++++++++++
2 files changed, 13 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index ea6b109..8ec15b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ glibc (2.23-2) UNRELEASED; urgency=medium
* hurd-i386/cvs-libpthread-2.23.diff: Update, adds pthread_setcancelstate
alias, fixes rsyslog start.
* hurd-i386/cvs-tabdly.diff: New patch. Closes: #830584.
+ * hurd-i386/local-clock_gettime_MONOTONIC.diff: Complete patch with
+ timer_create, to fix ghc 8 build.
-- Aurelien Jarno <aure...@debian.org> Mon, 04 Jul 2016 00:33:56 +0200
diff --git a/debian/patches/hurd-i386/local-clock_gettime_MONOTONIC.diff
b/debian/patches/hurd-i386/local-clock_gettime_MONOTONIC.diff
index 3260079..368bd3a 100644
--- a/debian/patches/hurd-i386/local-clock_gettime_MONOTONIC.diff
+++ b/debian/patches/hurd-i386/local-clock_gettime_MONOTONIC.diff
@@ -22,6 +22,17 @@ Index: eglibc-2.16/sysdeps/unix/clock_gettime.c
case CLOCK_REALTIME:
{
struct timeval tv;
+--- eglibc/sysdeps/pthread/timer_create.c.orig 2016-07-14 14:34:19.721218728
+0200
++++ eglibc/sysdeps/pthread/timer_create.c 2016-07-14 14:34:25.881187804
+0200
+@@ -48,7 +48,7 @@
+ return -1;
+ }
+
+- if (clock_id != CLOCK_REALTIME)
++ if (clock_id != CLOCK_REALTIME && clock_id != CLOCK_MONOTONIC)
+ {
+ __set_errno (EINVAL);
+ return -1;
Index: eglibc-2.16/sysdeps/mach/hurd/bits/posix_opt.h
===================================================================
--- eglibc-2.16.orig/sysdeps/mach/hurd/bits/posix_opt.h 2012-07-23
00:41:03.000000000 +0200
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-glibc/glibc.git
