Subject: Re: bug#54832: [patch] update glibc to 2.35

From: Ludovic Courtès <[email-masked]>
Date: Sun, 15 May 2022 23:31:53 +0200

Hello!

zamfofex <[email-masked]> skribis:

> Hello! I have decided I wanted to work on updating glibc. I tested the updated glibc with the packages ‘hello’, ‘coreutils’, ‘grep’, ‘sed’ and ‘guile’, and they all built successfully!

Yay!

>               (base32
> -              "1zvp0qdfbdyqrzydz18d9zg3n5ygy8ps7cmny1bvsp8h1q05c99f"))
> -            (patches (search-patches "glibc-ldd-powerpc.patch"
> -                                     "glibc-ldd-x86_64.patch"
> -                                     "glibc-dl-cache.patch"

Could you confirm that these patches are no longer needed?

> +                     (define empty-static-libraries '("libpthread.a" "libdl.a" "libutil.a" "libanl.a"))
> +                     (define (empty-static-library? file)
> +                       (any (lambda (s) (string=? file s)) empty-static-libraries))

[...]

>                              (files  (scandir lib static-library?))
> +                            (files2 (scandir lib empty-static-library?))
>                              (static (assoc-ref outputs "static"))
>                              (slib   (string-append static "/lib")))
>                         (mkdir-p slib)
> @@ -876,6 +883,10 @@ (define (linker-script? file)
>                                     (rename-file (string-append lib "/" base)
>                                                  (string-append slib "/" base)))
>                                   files)
> +                       (for-each (lambda (base)
> +                                   (copy-file (string-append lib "/" base)
> +                                              (string-append slib "/" base)))
> +                                 files2)

Like Maxime wrote, this needs comments in the code.

Could you explain why the empty .a files need special treatment?  In the
end, it seems we’re copying them to the “static” output anyway, so why
not let them in ‘files’?

>  (define-public m4
>    (package
>     (name "m4")
> -   (version "1.4.18")
> +   (version "1.4.19")

This should be done in a separate patch.

> +++ b/gnu/packages/patches/m4-failing-test-bug.patch
> @@ -0,0 +1,7 @@
> +--- a/tests/test-execute.sh
> ++++ b/tests/test-execute.sh

Like Maxime wrote, please start the patch with a short comment
explaining what it does, and with a link to the upstream commit or bug
report.

One last thing: could you use ‘git format-patch’ and (optionally) ‘git
send-email’ to send a revised patch?

  https://guix.gnu.org/manual/devel/en/html_node/Submitting-Patches.html

Thanks in advance, and apologies for the delay!

Ludo’.