From debbugs-submit-bounces@debbugs.gnu.org Thu Jul 04 07:39:40 2019 Received: (at submit) by debbugs.gnu.org; 4 Jul 2019 11:39:40 +0000 Received: from localhost ([127.0.0.1]:50474 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hj05T-0007Ts-UA for submit@debbugs.gnu.org; Thu, 04 Jul 2019 07:39:40 -0400 Received: from lists.gnu.org ([209.51.188.17]:46389) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hj05Q-0007Ti-HK for submit@debbugs.gnu.org; Thu, 04 Jul 2019 07:39:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59689) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hj05O-0006sD-Em for guix-patches@gnu.org; Thu, 04 Jul 2019 07:39:36 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_20,RCVD_IN_DNSWL_MED, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hj05M-000373-46 for guix-patches@gnu.org; Thu, 04 Jul 2019 07:39:34 -0400 Received: from mout01.posteo.de ([185.67.36.65]:34037) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hj05G-0002wI-1k for guix-patches@gnu.org; Thu, 04 Jul 2019 07:39:28 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id A64B5160061 for ; Thu, 4 Jul 2019 13:39:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1562240351; bh=bZvGta4pWZr4RJh/qc8ihlstDlxKHgymFI/bVhXXXrg=; h=From:To:Cc:Subject:Date:From; b=edwWymnfH7i2GwgFwdpu10voogJyt2oyPauuniO3PzO4YAw0sImxq71kDODECt12p kUCW/aQlaT3oXLFeJRDzy7O/VIB56D3Hk/EtJY9SbiKxNACebPuR8fasTa+yj4zDLL 4JXyS1djYMHVe5H5weQ+gs3sq2B1bAZ2/B6d7qq7SkG/1gPeKbCSL6fV22h6a3Hf8n cpvNWs8SQahpmyEuWXC97qDGnqUZzNHKBFYsKZ0vkkgSxRMPBEepSYAx7eCdYK6hBB EasHlsfFjApoFItxMCCNu69VbX4u6EJtgMoBtsY8tCZbs9M1CO56j2mfkkwu5WahyB kHXDtFtGh6yiw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 45fbbf339Tz6tmM; Thu, 4 Jul 2019 13:39:09 +0200 (CEST) From: Kei Kebreau To: guix-patches@gnu.org Subject: [PATCH] gnu: make-glibc-locales: Add patch to fix glibc-locales build for glibc 2.29. Date: Thu, 4 Jul 2019 07:39:06 -0400 Message-Id: <20190704113906.27800-1-kkebreau@posteo.net> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 185.67.36.65 X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Kei Kebreau , mbakke@fastmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) The patch for glibc 2.28 and earlier replaces the same content, but the c= ontext in the patch is different enough to fail to merge. * 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. --- gnu/local.mk | 1 + gnu/packages/base.scm | 10 +++++- gnu/packages/patches/glibc-locales-2.29.patch | 32 +++++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/glibc-locales-2.29.patch diff --git a/gnu/local.mk b/gnu/local.mk index bac1a92741..84c6190bd1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -867,6 +867,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/glibc-hurd-magic-pid.patch \ %D%/packages/patches/glibc-ldd-x86_64.patch \ %D%/packages/patches/glibc-locales.patch \ + %D%/packages/patches/glibc-locales-2.29.patch \ %D%/packages/patches/glibc-o-largefile.patch \ %D%/packages/patches/glibc-reinstate-prlimit64-fallback.patch \ %D%/packages/patches/glibc-vectorized-strcspn-guards.patch \ 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 differen= t + ;; 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")) (origin-patches (package-source glibc= )))))) (synopsis "All the locales supported by the GNU C Library") (description diff --git a/gnu/packages/patches/glibc-locales-2.29.patch b/gnu/packages= /patches/glibc-locales-2.29.patch new file mode 100644 index 0000000000..9329a09063 --- /dev/null +++ b/gnu/packages/patches/glibc-locales-2.29.patch @@ -0,0 +1,32 @@ +This patch allows us to use glibc's build system to build locales +in a package separate from glibc. + + 1. Use 'localedef' from $PATH since we are not rebuilding it. + 2. Use '--no-archive' to avoid building the big locale archive, and + because the already-built 'localedef' would want to write it + to '/run/current-system/locale', which is not possible. + 3. Pass $(inst_complocaledir)/$$locale to install files in the right + place, and because otherwise, 'localedef' fails with: + "cannot write output files to `(null)'". + +diff -ru glibc-2.29-old/localedata/Makefile glibc-2.29-new/localedata/Ma= kefile +--- glibc-2.29-old/localedata/Makefile 2019-01-31 11:45:36.000000000 -05= 00 ++++ glibc-2.29-new/localedata/Makefile 2019-07-03 22:48:35.662015071 -04= 00 +@@ -385,7 +385,7 @@ +=20 + # Sometimes the whole collection of locale files should be installed. + LOCALEDEF=3DI18NPATH=3D. GCONV_PATH=3D$(common-objpfx)iconvdata LC_ALL=3D= C \ +-$(rtld-prefix) $(common-objpfx)locale/localedef ++ localedef --no-archive + install-locales: install-locale-archive +=20 + # Create and install the locale-archive file. +@@ -414,7 +414,7 @@ + input=3D`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ + $(LOCALEDEF) $$flags --alias-file=3D../intl/locale.alias \ + -i locales/$$input -f charmaps/$$charset \ +- $(addprefix --prefix=3D,$(install_root)) $$locale \ ++ $(addprefix --prefix=3D,$(install_root)) $(inst_complocaledir)/$= $locale \ + && echo ' done'; + endef +=20 --=20 2.22.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 05 19:26:34 2019 Received: (at 36495) by debbugs.gnu.org; 5 Jul 2019 23:26:35 +0000 Received: from localhost ([127.0.0.1]:53969 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hjXb8-00071D-LJ for submit@debbugs.gnu.org; Fri, 05 Jul 2019 19:26:34 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:54191) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hjXb6-00070q-Ne for 36495@debbugs.gnu.org; Fri, 05 Jul 2019 19:26:33 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 4DD3B21AF2; Fri, 5 Jul 2019 19:26:27 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Fri, 05 Jul 2019 19:26:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm3; bh=cykmp1u8H7wwb2JSj1r2iQeufp rZ89WB3F/LoMj8EXc=; b=AOYB0VMOb5DelZmqN33ot5/MYBz8Z63IGn2jjCKZr0 zqaRNlfFjjrukYagP603BRLo8/C4p7OVHACx8SGIi1c4eJWOiq0IhVdRTCujLJqf s61253AccS44aH3GmqtLnLC2kdKpmJNK12jwrzXCU80bPjsh0TFRuHX/k5wbc1lO R+y3pzBZ+eIfw4h7k5S3EWMKU8fMDcbpD7UPSy7mcwRwPkfB3DGWorGwMLdd91ra 6ht6HR1C53xkskfipo/+dX83kK+nb3zGxNLp1aec9BCUdNxtajPQ3B80Tw3Fvp0I ZAocHnkSeOZCS+dIm8p1Wu12pU+WHbMR0qZPD1jPh+zQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=cykmp1 u8H7wwb2JSj1r2iQeufprZ89WB3F/LoMj8EXc=; b=Pkxb+op7sl1IfWdPp/CA4u Ck8OVhcxi5xDxi0HV5c9y0XMhwP9WPtuiDuusaHgkwSB3NgVX3rX/W6Yk/5v6dbh FaMAK1Y2RzmA8TIz/O68jFin5qOFwybgPSjZglB52tzKP3dniJiyg5uokg22n1CW oBwTYC7RKZb60UalO6yh/xEZJKiJTL2QDpdSwUyF+QAgP3wB1JmH8yGjOeIMeosy DVp66h61+2xDiVlEETwgjMAkvoD1vsLwlpCYxu2JXrKV85IJamb7t3Hs6mKOu+07 4ibNXNr91LCNMvU/m4DWIsTMbz6EPEScZpnbHlpXZuNvmRCK0spUa4CstKHRpXIQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddrfeehgddvudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffujghffgffkfggtgesghdtreertdertdenucfhrhhomhepofgrrhhiuhhs uceurghkkhgvuceomhgsrghkkhgvsehfrghsthhmrghilhdrtghomheqnecukfhppeeivd drudeirddvvdeirddugedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmsggrkhhkvges fhgrshhtmhgrihhlrdgtohhmnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id 2DCFB380087; Fri, 5 Jul 2019 19:26:26 -0400 (EDT) From: Marius Bakke To: Kei Kebreau , 36495@debbugs.gnu.org Subject: Re: [PATCH] gnu: make-glibc-locales: Add patch to fix glibc-locales build for glibc 2.29. In-Reply-To: <20190704113906.27800-1-kkebreau@posteo.net> References: <20190704113906.27800-1-kkebreau@posteo.net> User-Agent: Notmuch/0.29.1 (https://notmuchmail.org) Emacs/26.2 (x86_64-pc-linux-gnu) 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" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 36495 Cc: Kei Kebreau X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= 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----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 07 00:37:46 2019 Received: (at 36495) by debbugs.gnu.org; 7 Jul 2019 04:37:46 +0000 Received: from localhost ([127.0.0.1]:56064 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hjyvq-00017l-3h for submit@debbugs.gnu.org; Sun, 07 Jul 2019 00:37:46 -0400 Received: from mout02.posteo.de ([185.67.36.66]:53031) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hjyvk-00017G-Sm for 36495@debbugs.gnu.org; Sun, 07 Jul 2019 00:37:44 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id DF5DA2400E5 for <36495@debbugs.gnu.org>; Sun, 7 Jul 2019 06:37:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1562474252; bh=EbUO5vfVln+Ik9bdllDhoPx7f8M/kDftNmHf8qHS7dw=; h=From:To:Cc:Subject:Date:From; b=B/g0hlH8bdp46+2ds6Jfb70WUlx2uXlxFzwOnHGptbmAx+qmfCnB7JVZbcKtYc0Rh opIu5DQRRVbJjgyKa+/tQcrI4n+gGmXu7TpQbI1GnDzFQYSA7hPjFluPF0CdmYkn1+ 880gSjikC7Mz6aqAw0YnurrfGdki2WHGEfEt8HVl+Q+h6603PNZeFg6W0/6eH+5T0A SQChCyrT/enoJZKh9kJxGC3jaoluI/qOSPKEMeoVtad/BiWJVOZVqB6A9KmVR4FMXK xehkudlP2YdBzKDiN9NfQHGwFWyJN3GUoUjVBg90inTTJyGDFBZ4LN/E+EfX/4wcm8 /c3IWpMhDz03g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 45hG5k6fFhz9rxM; Sun, 7 Jul 2019 06:37:30 +0200 (CEST) From: Kei Kebreau To: Marius Bakke Subject: Re: [PATCH] gnu: make-glibc-locales: Add patch to fix glibc-locales build for glibc 2.29. 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> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) 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" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 36495 Cc: 36495@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= 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----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 08 12:57:04 2019 Received: (at 36495) by debbugs.gnu.org; 8 Jul 2019 16:57:04 +0000 Received: from localhost ([127.0.0.1]:59404 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkWwp-0003mf-LL for submit@debbugs.gnu.org; Mon, 08 Jul 2019 12:57:03 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:41055) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkWwm-0003lU-LB for 36495@debbugs.gnu.org; Mon, 08 Jul 2019 12:57:01 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 424B521111; Mon, 8 Jul 2019 12:56:55 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Mon, 08 Jul 2019 12:56:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm3; bh=ejOer5neurtXCj/Rw1u0ZRNQj1 Ds4p692YGv9uc1tKY=; b=j7b/6YAYdwOBBMNuUOd64j1GCFIx8WiiNK4D5cILHZ PCXvWpiXWqBUI/j5SEI+tAjQ+MIm53C4r6EOStsnUfZjLP7N/T+Mdg6U6FeaaNP9 ojVkZyt7TlWzKuUKYnD9HccSNsxRmJUuVi2A2zeMztS1w6deIUDYsRS9Bqx7U5+k BUw6XLn6WrpXSIYrW64q19SG9hKWmYPQ5DceyfY7M8ZnDF0MSVWg6hKOFXduLGC2 ikWYFDFLMpQZBINPV09341szpUCxg0oiAQP0WwwauxokFwgsFj1R0l0giIwJuTVD aejzjSfW/7kNikZAafC2KkZgs3vWCEjGYEeoNQtzqULA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=ejOer5 neurtXCj/Rw1u0ZRNQj1Ds4p692YGv9uc1tKY=; b=io5E0I8V4XDIj7xjS1xiIc 0MweuQi4JVGznawRQmBxbDUwH36p/nJd+ecFlNH0Oi+qks5T16bMmXdDuPE2Oulh ngxGH0w6/hps0WB5x1v5YRq8EZE5LwEC7MpSHxwWJVYFt3rC9sT/4Ndk8Jl5Hg9U rNLRw6G0XniKOutGEqdEXUJEVfk1uKTE1qM1/+nbR7WjPmZm5cbuA0m8FX+REdoU aX+sX27yoz8hv0LTIM5f3QTpGBer16RJR8kvJBsNt3b3I7ckt3LEesFkztHxEZme AT97MA3M6F39vkpvRZLnuyS0nwPlMrOc5vIdegIzUzQ4WX4OmDNrhO1ASWyA0U7w == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddrgedtgddutdelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufgjfhgffffkgggtsehgtderredtredtnecuhfhrohhmpeforghrihhu shcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmqeenucfkphepie dvrdduiedrvddviedrudegtdenucfrrghrrghmpehmrghilhhfrhhomhepmhgsrghkkhgv sehfrghsthhmrghilhdrtghomhenucevlhhushhtvghrufhiiigvpedt X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id 64DF838008C; Mon, 8 Jul 2019 12:56:54 -0400 (EDT) From: Marius Bakke To: Kei Kebreau Subject: Re: [PATCH] gnu: make-glibc-locales: Add patch to fix glibc-locales build for glibc 2.29. In-Reply-To: <87d0im794m.fsf@posteo.net> References: <20190704113906.27800-1-kkebreau@posteo.net> <87r274qd0g.fsf@devup.no> <87d0im794m.fsf@posteo.net> User-Agent: Notmuch/0.29.1 (https://notmuchmail.org) Emacs/26.2 (x86_64-pc-linux-gnu) Date: Mon, 08 Jul 2019 18:56:52 +0200 Message-ID: <87tvbwpiqz.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 36495 Cc: 36495@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain Kei Kebreau writes: > 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. 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!). --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl0jddQACgkQoqBt8qM6 VPq2tQf+NL/qklICgnU+wG5AogTc6Lbuf7qbb6prXu4NX8u143gyvGvqYnBB5iv3 tEeM0uOpOvO0BAp86KpGhq+XYO2/I6iUOPHDqy4Dm01OewaOaHy1EZQamkudE/yD 41iSaH9tNNspDkfQkmwTHFj+QHl0q6wYvzervh8/1E5BWeEmggb3EMqLnw/HQnHJ zmz6eMEaOKoxkBqX41elljUcEpJvrgeUGsOBpNwg+wmojPIBO0c7vsUGXyQKw9OH mrl2oHLNLZMDokyzN1tDzbht+NPfb+FoXoIBIuYddId4ORfNOo3GjZJq4FBmfKlI JAiO/ur7/cptqrVBKs041SiLyxWFmA== =gp0z -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 08 16:37:39 2019 Received: (at 36495) by debbugs.gnu.org; 8 Jul 2019 20:37:39 +0000 Received: from localhost ([127.0.0.1]:59682 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkaOJ-0007TY-Kw for submit@debbugs.gnu.org; Mon, 08 Jul 2019 16:37:39 -0400 Received: from mout02.posteo.de ([185.67.36.66]:35123) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkaOG-0007TH-Oe for 36495@debbugs.gnu.org; Mon, 08 Jul 2019 16:37:38 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 3CD1B2400FC for <36495@debbugs.gnu.org>; Mon, 8 Jul 2019 22:37:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1562618250; bh=94tBc0O1ix8UeZw4xwtyBku0z3oDFR2hlADkzqnkxw8=; h=From:To:Cc:Subject:Date:From; b=jaYdJ9H4Ubv0/IPsRraVer4zArOqQPQYLcP9yBN6TRovKIwsCU3aJO/6+r9k0iuOc mhtgnU8YwFb2JikVfFGAwGEP5og/WoTGI4nIQsgdSrL8YIC9GK3ONPLyyJLDalKpGS yMvnAFk71EtLQGEB1LCJIVRArpPKK81Hr1AwrOhFrwOwMOuvHp+NBKqhWz2LyMNXKJ iBxloxfhuyP+NqoMfROgWmVtDPcd5oyBrhK3APwl7Qdth36hkOhVGxjHAQiL+9EX84 dugagXhJESR0qO3JT4NeHcuo0hGT0NuzdjosLzLtbMW7i70Rg+gOsh3PlLT2519A1G YG2iSL4Kg5lJw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 45jHLw1PrWz9rxB; Mon, 8 Jul 2019 22:37:16 +0200 (CEST) From: Kei Kebreau To: Marius Bakke Subject: Re: [PATCH] gnu: make-glibc-locales: Add patch to fix glibc-locales build for glibc 2.29. References: <20190704113906.27800-1-kkebreau@posteo.net> <87r274qd0g.fsf@devup.no> <87d0im794m.fsf@posteo.net> <87tvbwpiqz.fsf@devup.no> Date: Mon, 08 Jul 2019 16:37:04 -0400 In-Reply-To: <87tvbwpiqz.fsf@devup.no> (Marius Bakke's message of "Mon, 08 Jul 2019 18:56:52 +0200") Message-ID: <87tvbwfekv.fsf@posteo.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 36495 Cc: 36495@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain Marius Bakke writes: > Kei Kebreau writes: > >> 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!). I can get you the exact error messages as soon as my GNOME + core-updates build finishes, but they seem to be similar to the messages one gets when running Guix on a foriegn distro without installing glibc-locales or glibc-utf8-locales. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAl0jqXAACgkQ5qXuPBlG eg3HfQ/+KORpEaXimfOLBm3fnADj4yJs4ZScHwHObmSQjzzfERELgcHz7VeCNQ10 E3yJjUlvTJiPrrZaPigy9Do+m0OjL6nRGylzaAa4ldecGeCUTszKnws8PUDd36Sn GYXtl6SwcC7RA4RAKlLkXeV1G8hPqKD8/Qmp2MECXDdw+BKEq6IOHZgIag+HguSb 3uYv3UHuaLmx/FA3CDuCSgT8pnyVqPfzkiNCGLNDJCO5Lr8hX8mpYbXvdS2ckaLi 0L//zdAuP7mR4zQ4Z/kAJVqCBJvBIWNkS/qSiFPp2E3HTXi2pXnt8BfNXncNZ0p7 mlPBoGs3w7yJV8WoEQYT1Do5/LDKyHsaQ9sbTsBOfn84DZgOR5PBKDU+zAbX6qbR Rce/4yDe7vQYbpmsM0j9oVBcTmi2U37ou/AVMsaCZNfLUMw5WR14t80Q0EQI6Rsd otrzghg0n5Rui1kiUZJVc0R6iWGFJT5CpRK1a9zhxc6RvEZMMssaYYgN/wd3KZmt gYEx0TCBQT13I3JDRheprCYduzThkx/F6uDfrVXTGxdjkpy2hqlKWbIPQb/BmE1z yhU7mGdPq7cew1543CrG69WdHNQPi2/8bXlbB2kQkm4jLDUowGiMXxlsJTZKLoq/ xcuadoGITo21Dyyc80eoTklYcjsjlwqqMRKhr/yIG0PFekPtL6w= =8xvs -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 09 12:26:16 2019 Received: (at 36495-done) by debbugs.gnu.org; 9 Jul 2019 16:26:16 +0000 Received: from localhost ([127.0.0.1]:33983 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkswZ-0008BK-T6 for submit@debbugs.gnu.org; Tue, 09 Jul 2019 12:26:16 -0400 Received: from mout01.posteo.de ([185.67.36.65]:45176) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkswX-0008B5-GE for 36495-done@debbugs.gnu.org; Tue, 09 Jul 2019 12:26:14 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 676BF160064 for <36495-done@debbugs.gnu.org>; Tue, 9 Jul 2019 18:26:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1562689565; bh=524rcT53RMb4s7Y9r5SklTJzRi9sRkSGZAdRITPbtPc=; h=From:To:Cc:Subject:Date:From; b=BZD5Cc9INSlXPRxUqUXYLQdfYcf/gY4XAV3SmSkIVx6srFdKlPFshwBSxg0MABJ3a 2l89To9149UjxhsyoSnmYOmKUBQdT3ek2HLozl5tzRpPMxaIfcvdz3W39D7lJjRZVd 5qusk9iCw1yx2B+3T/MSl8+Ofx4sCmIgif2rR3IDmaqQJU62j41VQvENu5MSN6nJE+ tmBywYxqwf4PJ0tL8zEP+tm5g25uMaLN6zepItpTsD14a5hGAMJTf6hSEalrShRJ0c SFnsVkrM/85V+I+XT7lK1TXzyR8VooPeDMH2Dk62WBzJajDfYYr/N7dzVxItVsBkJN vIi0kRWoOEaIg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 45jnkM6K9rz6tmF; Tue, 9 Jul 2019 18:26:03 +0200 (CEST) From: Kei Kebreau To: Marius Bakke Subject: Re: [PATCH] gnu: make-glibc-locales: Add patch to fix glibc-locales build for glibc 2.29. References: <20190704113906.27800-1-kkebreau@posteo.net> <87r274qd0g.fsf@devup.no> <87d0im794m.fsf@posteo.net> <87tvbwpiqz.fsf@devup.no> Date: Tue, 09 Jul 2019 12:26:01 -0400 In-Reply-To: <87tvbwpiqz.fsf@devup.no> (Marius Bakke's message of "Mon, 08 Jul 2019 18:56:52 +0200") Message-ID: <871ryzmaxy.fsf@posteo.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 36495-done Cc: 36495-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain Marius Bakke writes: > Kei Kebreau writes: > >> 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. > > 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!). Pushed to core-updates! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAl0kwBkACgkQ5qXuPBlG eg3k7BAAuLBzRKDkrPir4uHCV0lDCn6ZTvAj5d7vc2a+4vTXYiWFcASFJ8WaqEhq n08w84GQKSIxw+tQo5l+/tKKQGa6vk8Bw2SndGzmSlcuXdZM5jOb0N+MytnnxNdc B4F+ps/VxSf0hu+K140LXosZzFOB2eqKrGXZ8MXCCsab7OZuHVk8j2u5txZSIb7A AqOTf2kGbzxjYqWS8D8b73tg6faydBZcyqX0kHPyUcSSVwpQZQRS1noJUWtyZ9/O DkEK3uZWPj0EGpumgQfqV3XJZmlnUywEUJBjcp6dOVhcRj3D0WvYCAHrbVtiZK/N XVx/JWxjR0GbaC9yc01Wnrx01EQrzpODhon0vBbjNP/7nIX95VcUSrSMr9EOjvba 55fwfiRgRFXXUb3+kFp4vkZ3GuSVtWAmGf5pdPF5pU/azaZFoak5zv7g8P5/4ZzE 7D4EskyhwkwGWRKO/SGEe9g8QnIfNDPHHiFDT9w0nT6Qcn6THP4BRQLvlwFVaxiX lBPngwEWB7mGxswdKYzu+gmZcqYfwsAJh6g19OnPe1I7vulAI6WdyQIaKIJmAROO QhiN1CA33/NFGcJjEFfjYwHfIYwmk9bdajDIjPej0LDZaJPnetjHF+GIuMgeP+na drwMv84awpZe4YbnKoleHs7B0ezs/NbtzOOLhIreYDM4f3dEUX4= =7FoJ -----END PGP SIGNATURE----- --=-=-=-- From unknown Sat Jun 14 19:47:39 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 07 Aug 2019 11:24:11 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator