Subject: Re: [PATCH] gnu: make-glibc-locales: Add patch to fix glibc-locales build for glibc 2.29.

From: Marius Bakke <[email-masked]>
Date: Mon, 08 Jul 2019 18:56:52 +0200

Kei Kebreau <[email-masked]> writes:

> Marius Bakke <[email-masked]> writes:
>
>> Kei Kebreau <[email-masked]> writes:
>>
>>> The patch for glibc 2.28 and earlier replaces the same content, but the context
>>> in the patch is different enough to fail to merge.
>>
>> Whoops, thanks for addressing this!
>>
>>> * gnu/packages/base.scm (make-glibc-locales)[source]: Add patch.
>>> * gnu/packages/patches/glibc-locales-2.29.patch: New file.
>>> * gnu/local.mk (dist_patch_DATA): Add it.
>>
>> [...]
>>
>>> diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
>>> index f26145cb0b..d6df023f26 100644
>>> --- a/gnu/packages/base.scm
>>> +++ b/gnu/packages/base.scm
>>> @@ -999,7 +999,15 @@ with the Linux kernel.")
>>>      (inherit glibc)
>>>      (name "glibc-locales")
>>>      (source (origin (inherit (package-source glibc))
>>> -                    (patches (cons (search-patch "glibc-locales.patch")
>>> +                    ;; The patch for glibc 2.28 and earlier replaces the same
>>> +                    ;; content, but the context in the patch is different
>>> +                    ;; enough to fail to merge.
>>> +                    (patches (cons (search-patch
>>> +                                    (if (< 2.29
>>> +                                           (string->number
>>> +                                            (package-version glibc)))
>>> +                                        "glibc-locales.patch"
>>> +                                        "glibc-locales-2.29.patch"))
>>
>> Please use 'version>=?' here, as this will fail for e.g. glibc 2.3.
>>
>> I have a slight preference for renaming the previous patch to
>> 'glibc-locales-2.28.patch', so that 'glibc-locales.patch' refers to the
>> newest libc.  Less surprises for the end user when trying newer
>> versions.  :-)
>>
>> Apart from that LGTM, thanks!
>
> I just finished building my system with this patch and the almost-finished
> GNOME updates, and lots of weird stuff goes on. I'll investigate and push
> this patch when it works properly.

The weird stuff is unrelated to this patch, no?  :-)

FWIW the current core-updates "works for me", but I haven't gotten
around to trying GNOME on it yet (there are some important packages
failing still -- help wanted!).