From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:60051) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjyw7-0004bg-Tp for guix-patches@gnu.org; Sun, 07 Jul 2019 00:38:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hjyw6-0004dt-Tc for guix-patches@gnu.org; Sun, 07 Jul 2019 00:38:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47243) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hjyw6-0004dO-Gm for guix-patches@gnu.org; Sun, 07 Jul 2019 00:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hjyw6-00018F-9x for guix-patches@gnu.org; Sun, 07 Jul 2019 00:38: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: Kei Kebreau In-Reply-To: <87r274qd0g.fsf@devup.no> (Marius Bakke's message of "Sat, 06 Jul 2019 01:26:23 +0200") References: <20190704113906.27800-1-kkebreau@posteo.net> <87r274qd0g.fsf@devup.no> Date: Sun, 07 Jul 2019 00:37:29 -0400 Message-ID: <87d0im794m.fsf@posteo.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; 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: Marius Bakke Cc: 36495@debbugs.gnu.org --=-=-= Content-Type: text/plain Marius Bakke writes: > 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! 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. Thanks for the review! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAl0hdwkACgkQ5qXuPBlG eg2YCRAAvKsACMtQhhYuI8moJ2yFR57pdbeclhWOeXqQVV4CXfYxz3rO8w5je/2E oYvfN5P67646/JSfnm6N8JTtHlzRLr5I3Gc0WwBkZHDe7GZXijNNOqoVQXG92/i2 WW25rMMuh8NyCs8D0AcJMZI1wmvda+loRVQm8bVKdFLLe9kAOv12zcU4AQE3mrkP H/Kx+6abREcphPx5YYxNZ5YQ7pXw6gxIdIRC0K4+QndMuiUv9AGl3aSGx3Fcazq2 i33r44+5bVwfBIOop8wEJi4X/BSzzCP1Px8JH+gB6L5eoRqkxo7ZlHglHVwzI70x oIYcfzqWvma19YFtCpIj2vPwAwKv9eQ7YgjZbBQQ0z88GVilE6RlakgrmcUson5s kqUSnRYfyHtUmmnJ/YENotIaJLoLOSkmkt80A3NEzSoez5ry7J9FBlRAgm6ETvcc R1hwTisgQ6FTctqoon87kuqHYcOdy8vOd6DPclFd7kRIWrdiufH84q8Yrvx3LivO +eKsAktbq6VWXUmmLjastzR4JAjpk9WyP4s/vO2IvuzYOEOf7C/rmNbrY/a1me0Z /Y4qRRWzLaY8ghmTF5mXSl/KF702zG085mRpYt4jILngCYu9Dg1Y/aaYUGu3HBb8 76RTDk7EgG4/tKwCnL9c6xz/6q9WPSMzHEcQhUyJJ1dP7DBm41w= =QMEL -----END PGP SIGNATURE----- --=-=-=--