From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:39346) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjXbb-00037a-SM for guix-patches@gnu.org; Fri, 05 Jul 2019 19:27:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hjXba-00034H-Sb for guix-patches@gnu.org; Fri, 05 Jul 2019 19:27:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45148) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hjXba-00034B-JN for guix-patches@gnu.org; Fri, 05 Jul 2019 19:27:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hjXba-00071x-Fc for guix-patches@gnu.org; Fri, 05 Jul 2019 19:27:02 -0400 Subject: [bug#36495] [PATCH] gnu: make-glibc-locales: Add patch to fix glibc-locales build for glibc 2.29. Resent-Message-ID: From: Marius Bakke In-Reply-To: <20190704113906.27800-1-kkebreau@posteo.net> References: <20190704113906.27800-1-kkebreau@posteo.net> Date: Sat, 06 Jul 2019 01:26:23 +0200 Message-ID: <87r274qd0g.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Kei Kebreau , 36495@debbugs.gnu.org --=-=-= Content-Type: text/plain Kei Kebreau 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! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl0f3J8ACgkQoqBt8qM6 VPr6xAgAg+Ui9CjuBdndyJkY8A29I04D542xQbe3q8ToQ83dFibCvMh1g8LoTHxB GfRb77xFKO/pYnQHL0YaRAPbpgXtB13BhvFMMm9p/68f63iEhXAws2gXeYdHLywR 3k2BrKTDc/fwMcCGKMCwdwDYn+r5wHyWqzbqgio+JEGIKxNs+gLCixMhugdvYFrG UOuIc7REBoxSfKK5zcdvEIuHaiVJ/lWU12/N53WZPCWbjog/ubiUw/Yfcr5OBVUa 6qg+WLwX/rqT1MWHinEnxnCjajrkFA2L/iagWuTGyVqcARAHn2NYCXAJ3DmlQSGc MSsjpDt7k1ECtPe8lJCVpe5P0gCGlw== =FMuK -----END PGP SIGNATURE----- --=-=-=--