Subject: [bug#63527] [PATCH 0/3] Initial attempt at rumpdisk support for the Hurd.

From: Ludovic Courtès <[email-masked]>
Date: Thu, 18 May 2023 19:10:53 +0200

Hello!

Awesome patch series!!

Janneke Nieuwenhuizen <[email-masked]> skribis:

> +++ b/gnu/packages/cross-base.scm
> @@ -1,7 +1,7 @@
>  ;;; GNU Guix --- Functional package management for GNU
>  ;;; Copyright © 2013-2018, 2020, 2023 Ludovic Courtès <[email-masked]>
>  ;;; Copyright © 2014, 2015, 2018 Mark H Weaver <[email-masked]>
> -;;; Copyright © 2016, 2019 Jan (janneke) Nieuwenhuizen <[email-masked]>
> +;;; Copyright © 2016, 2019, 2023 Janneke Nieuwenhuizen <[email-masked]>
>  ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <[email-masked]>
>  ;;; Copyright © 2018 Tobias Geerinckx-Rice <[email-masked]>
>  ;;; Copyright © 2019, 2020, 2021 Marius Bakke <[email-masked]>
> @@ -624,7 +624,22 @@ (define* (cross-libc* target
>                                 (("/[^ ]+/lib/libc.so.0.3")
>                                  (string-append out "/lib/libc.so.0.3"
>                                                 " libmachuser.so libhurduser.so"))))
> -                           #t)))
> +                           #t))
> +                       ;; TODO: move to glibc in the next rebuild cycle
> +                       (add-after 'unpack 'patch-libc/hurd
> +                         (lambda* (#:key inputs #:allow-other-keys)
> +                           (for-each
> +                            (lambda (name)
> +                              (let ((patch (assoc-ref inputs name)))
> +                                (invoke "patch" "-p1" "--force" "-R" "-i" patch)))
> +                            '("hurd-monotonic.patch"
> +                              "hurd-centiseconds.patch"))

Since this should also be applied when building glibc natively on
i586-gnu, should this phase go to ‘glibc’ in (gnu packages base)
instead?

Also, in general, we should move away from quasiquote/unquote to
gexp/ungexp, which will allow us to not add inputs for patches (as is
done with ‘gcc-11’ in (gnu packages gcc)).

> +                                 ;; TODO: move to glibc in the next rebuild cycle
> +                                 ("hurd-monotonic.patch"
> +                                  ,@(search-patches
> +                                     "glibc-hurd-clock_gettime_monotonic.patch"))
> +                                 ("hurd-centiseconds.patch"
> +                                  ,@(search-patches
> +                                     "glibc-hurd-clock_t_centiseconds.patch"))
> +                                 ("2.35-hurd-monotonic.patch"
> +                                  ,@(search-patches
> +                                     "glibc-2.35-hurd-clock_gettime_monotonic.patch"))
> +                                 ("2.35-hurd-centiseconds.patch"
> +                                  ,@(search-patches
> +                                     "glibc-2.35-hurd-clock_t_centiseconds.patch")))

Let’s hope these patches will soon make it upstream!

Ludo’.