From: Marius Bakke <mbakke@fastmail.com>
To: Kei Kebreau <kkebreau@posteo.net>, 36495@debbugs.gnu.org
Subject: [bug#36495] [PATCH] gnu: make-glibc-locales: Add patch to fix glibc-locales build for glibc 2.29.
Date: Sat, 06 Jul 2019 01:26:23 +0200 [thread overview]
Message-ID: <87r274qd0g.fsf@devup.no> (raw)
In-Reply-To: <20190704113906.27800-1-kkebreau@posteo.net>
[-- Attachment #1: Type: text/plain, Size: 1685 bytes --]
Kei Kebreau <kkebreau@posteo.net> 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!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
next prev parent reply other threads:[~2019-07-05 23:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-04 11:39 [bug#36495] [PATCH] gnu: make-glibc-locales: Add patch to fix glibc-locales build for glibc 2.29 Kei Kebreau
2019-07-05 23:26 ` Marius Bakke [this message]
2019-07-07 4:37 ` Kei Kebreau
2019-07-08 16:56 ` Marius Bakke
2019-07-08 20:37 ` Kei Kebreau
2019-07-09 16:26 ` bug#36495: " Kei Kebreau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87r274qd0g.fsf@devup.no \
--to=mbakke@fastmail.com \
--cc=36495@debbugs.gnu.org \
--cc=kkebreau@posteo.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).