This is needed to run Python on the Hurd, especially during the build of python-boot0. Adapted from https://salsa.debian.org/glibc-team/glibc/-/blob/glibc-2.31/debian/patches/hurd-i386/unsubmitted-clock_t_centiseconds.diff commit d57f2f9b4bd007846af2fb4217486ea572579010 Author: Richard Braun Date: Tue Aug 27 11:35:31 2013 +0200 Express CPU time (clock_t of times(2)) in centiseconds From 170c292b643fdc1eb56881e6592b07c0c019993e Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 2 Mar 2020 18:28:54 +0100 Subject: [PATCH 1/2] Express CPU time (clock_t) in centiseconds --- sysdeps/mach/hurd/clock.c | 8 ++++---- sysdeps/mach/hurd/getclktck.c | 5 ++--- sysdeps/mach/hurd/setitimer.c | 2 +- sysdeps/mach/hurd/times.c | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/sysdeps/mach/hurd/clock.c b/sysdeps/mach/hurd/clock.c index 7cb42df786..4db49b579d 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 943e36e805..5a3cf0930b 100644 --- a/sysdeps/mach/hurd/getclktck.c +++ b/sysdeps/mach/hurd/getclktck.c @@ -18,12 +18,11 @@ #include -/* Return frequency of `times'. - Since Mach reports CPU times in microseconds, we always use 1 million. */ +/* Return frequency of `times'. */ int __getclktck (void) { - return 1000000; + return 100; } /* Before glibc 2.2, the Hurd actually did this differently, so we diff --git a/sysdeps/mach/hurd/setitimer.c b/sysdeps/mach/hurd/setitimer.c index b16f4ddd5d..8bf1464830 100644 --- a/sysdeps/mach/hurd/setitimer.c +++ b/sysdeps/mach/hurd/setitimer.c @@ -43,7 +43,7 @@ quantize_timeval (struct timeval *tv) static time_t quantum = -1; if (quantum == -1) - quantum = 1000000 / __getclktck (); + quantum = 100 / __getclktck (); tv->tv_usec = ((tv->tv_usec + (quantum - 1)) / quantum) * quantum; if (tv->tv_usec >= 1000000) diff --git a/sysdeps/mach/hurd/times.c b/sysdeps/mach/hurd/times.c index 23ed992783..cbf6039b19 100644 --- a/sysdeps/mach/hurd/times.c +++ b/sysdeps/mach/hurd/times.c @@ -29,7 +29,7 @@ static inline clock_t clock_from_time_value (const time_value_t *t) { - return t->seconds * 1000000 + t->microseconds; + return t->seconds * 100 + t->microseconds / 10000; } /* Store the CPU time used by this process and all its -- 2.24.0 /profiles.scm Marius Bakke 2021-04-25gnu: xfce, mate: Propagate 'font-dejavu'....Fixes <https://bugs.gnu.org/47713>. Reported by bo0od <bo0od@riseup.net>. This ensures applications such as IceCat can properly text (numbers in the case of IceCat). * gnu/packages/enlightenment.scm (enlightenment)[propagated-inputs]: Add FONT-DEJAVU. * gnu/packages/mate.scm (mate)[propagated-inputs]: New field. * gnu/packages/xfce.scm (xfce)[propagated-inputs]: New field. Ludovic Courtès 2021-03-24Merge remote-tracking branch 'origin/master' into core-updatesEfraim Flashner 2021-03-22gnu: mate-panel: Add missing inputs for Wayland support....* gnu/packages/mate.scm (mate-panel)[inputs]: Add gtk-layer-shell and wayland. Léo Le Bouter 2021-03-17gnu: Use autoconf instead of autoconf-wrapper when possible....This should reduce confusion on when to use the "autoconf" package and when to use "autoconf-wrapper" instead in package definitions. Fixes <https://bugs.gnu.org/46564>. * gnu/packages/autotools.scm (autoconf-wrapper): advise to use the "autoconf" package instead where possible. * gnu/packages/game-development.scm (tsukundere)[native-inputs]: use "autoconf" instead of "autoconf-wrapper". * gnu/packages/gimp.scm (glimpse)[native-inputs]: likewise. (gimp-resynthesizer)[native-inputs]: add comment on why "autoconf-wrapper" is used. * gnu/packages/gnunet.scm (gnunet)[native-inputs]: use "autoconf" instead of "autoconf-wrapper". * gnu/packages/gnupg.scm (signing-party)[native-inputs]: add comment on why "autoconf-wrapper" is used. * gnu/packages/guile-xyz.scm (guile-bash,guile-filesystem,guile-ics,guile-udev)[native-inputs]: use "autoconf" instead of "autoconf-wrapper". * gnu/packages/libevent.scm (libuv)[native-inputs]: indicates "autoconf-wrapper" needs to be replaced with "autoconf" on core-updates. * gnu/packages/logging.scm (glog)[native-inputs]: use "autoconf" instead of "autoconf-wrapper". * gnu/packages/mail.scm (libetpan)[native-inputs]: likewise. * gnu/packages/mate.scm (mate-icon-theme-faenza)[native-inputs]: add comment on why "autoconf-wrapper" is used. (mate-screensaver)[native-inputs]: use "autoconf" instead of "autoconf-wrapper". * gnu/packages/package-management.scm (guix)[native-inputs]: likewise. * gnu/packages/sawfish.scm (librep)[native-inputs]: likewise. * gnu/packages/video.scm (motion)[native-inputs]: likewise. * gnu/packages/zile.scm (zile)[native-inputs]: likewise. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Maxime Devos