This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch sid
in repository glibc.
commit 0c39adc7553c9d54d3b93deabc6b98ec9a771e4f
Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Date: Wed Aug 23 01:22:00 2017 +0200
hurd: Drop clock() part from centiseconds patch,
it always uses CLOCKS_PER_SEC which is always 1000000. Should
fix ffmpeg build.
patches/hurd-i386/unsubmitted-clock_t_centiseconds.diff
---
debian/changelog | 5 ++++-
.../unsubmitted-clock_t_centiseconds.diff | 22 +---------------------
2 files changed, 5 insertions(+), 22 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5c52f69..9261334 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
glibc (2.24-17) UNRELEASED; urgency=medium
- *
+ [ Samuel Thibault ]
+ * patches/hurd-i386/unsubmitted-clock_t_centiseconds.diff: Drop clock() part
+ from patch, it always uses CLOCKS_PER_SEC which is always 1000000. Should
+ fix ffmpeg build.
-- Aurelien Jarno <aure...@debian.org> Mon, 21 Aug 2017 08:55:57 +0200
diff --git a/debian/patches/hurd-i386/unsubmitted-clock_t_centiseconds.diff
b/debian/patches/hurd-i386/unsubmitted-clock_t_centiseconds.diff
index 21db209..27db59e 100644
--- a/debian/patches/hurd-i386/unsubmitted-clock_t_centiseconds.diff
+++ b/debian/patches/hurd-i386/unsubmitted-clock_t_centiseconds.diff
@@ -2,7 +2,6 @@ Some applications assume centisecond precision, or at most
millisecond precision
(e.g. guile). This is a work-around for them.
---
- clock.c | 8 ++++----
getclktck.c | 5 ++---
setitimer.c | 2 +-
times.c | 2 +-
@@ -11,27 +10,8 @@ commit d57f2f9b4bd007846af2fb4217486ea572579010
Author: Richard Braun <rbr...@sceen.net>
Date: Tue Aug 27 11:35:31 2013 +0200
- Express CPU time (clock_t) in centiseconds
+ Express CPU time (clock_t of times(2)) in centiseconds
-diff --git a/sysdeps/mach/hurd/clock.c b/sysdeps/mach/hurd/clock.c
-index 61a66be..51f7abe 100644
---- a/sysdeps/mach/hurd/clock.c
-+++ b/sysdeps/mach/hurd/clock.c
-@@ -44,10 +44,10 @@ clock (void)
- if (err)
- return __hurd_fail (err);
-
-- total = bi.user_time.seconds * 1000000 + bi.user_time.microseconds;
-- total += tti.user_time.seconds * 1000000 + tti.user_time.microseconds;
-- total += bi.system_time.seconds * 1000000 + bi.system_time.microseconds;
-- total += tti.system_time.seconds * 1000000 + tti.system_time.microseconds;
-+ total = bi.user_time.seconds * 100 + bi.user_time.microseconds / 10000;
-+ total += tti.user_time.seconds * 100 + tti.user_time.microseconds / 10000;
-+ total += bi.system_time.seconds * 100 + bi.system_time.microseconds / 10000;
-+ total += tti.system_time.seconds * 100 + tti.system_time.microseconds /
10000;
-
- return total;
- }
diff --git a/sysdeps/mach/hurd/getclktck.c b/sysdeps/mach/hurd/getclktck.c
index 69be2cc..5f7d946 100644
--- a/sysdeps/mach/hurd/getclktck.c
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-glibc/glibc.git
