From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 07 05:20:31 2023 Received: (at submit) by debbugs.gnu.org; 7 Dec 2023 10:20:31 +0000 Received: from localhost ([127.0.0.1]:41118 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBBUd-0005Pr-Dk for submit@debbugs.gnu.org; Thu, 07 Dec 2023 05:20:31 -0500 Received: from lists.gnu.org ([2001:470:142::17]:40758) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBBUb-0005PW-GI for submit@debbugs.gnu.org; Thu, 07 Dec 2023 05:20:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBBUD-0002p4-21 for guix-patches@gnu.org; Thu, 07 Dec 2023 05:20:05 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBBUC-0000Gf-QO; Thu, 07 Dec 2023 05:20:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=6w86qUN9+LMUH/6IufU14x4R6AcktH0+ulO16tEGviA=; b=ibY3pPHOl0+WOv 5m4wBKOETBhNHdpPce62oGmiCfc4Cmaz6KpGEDbMccw1v9dVQr/WMx6uOb2IXrlYOB9gL/L2GbdQ/ 0ZTHtc/uexd8YP3zLRt9FhwJbz3q2907xg2EPrXkhot+XvCO1b0f2XdPLolYU76OA38DzZeL4a8i3 /8mrXKmcDV1k1lDmUY3UzBqLlIi/ZX94y/80f95hoyU047nQDvP7IEBYpzjSJzwgxNDFai58GGnpv oyflj+2WKR8QWef09I6bBE5eZvzpIf8Jf01DqGyBkeARJhTVgdFzwwL0y3wlO6gt4iCJLl99nts4a UYLN+V4/BwiT4rvScjYA==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: guix-patches@gnu.org Subject: [PATCH core-updates 0/5] Update glibc to 2.38; make C.UTF-8 always available Date: Thu, 7 Dec 2023 11:19:52 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: submit Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 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.0 (-) Hello fellow core updaters! Here’s a patch to (1) upgrade glibc on ‘core-updates’, and (2) make the “C.UTF-8” locale always available. The upgrade itself will need several iterations so we can check whether cross-compilation still works, for which we need help from ci.guix. It removes ‘glibc-allow-kernel-2.6.32.patch’, which no longer applies, so we’ll have to do a poll to ensure nobody relies on this (this is mostly for HPC people, who tend to have machines running old and heavily-patched kernels, but hopefully this particular flavor is now gone.) With the upgrade, we should be able to: (define-public glibc/hurd glibc) Perhaps we’ll even get support for x86_64-gnu (!), though IIRC we may need a couple more patches. As for #2, it means that: setlocale (LC_ALL, "C.UTF-8"); is guaranteed to always succeed. This is pretty big deal for us because then we can get rid of most use cases for ‘glibc-utf8-locales’. The main use of ‘glibc-utf8-locales’ is to ensure that Guile (and other programs that behave similar) can run in a UTF-8 locale and thus decode file names & co. according to that locale’s encoding. We’ll be able to replace snippets like: #~(begin (setenv "GUIX_LOCPATH" #$(file-append glibc-utf8-locales "/lib/locale")) (setlocale LC_ALL "en_US.utf8") …) with: #~(begin (setlocale LC_ALL "C.UTF-8") …) Thoughts? Note that I needed Greg’s GCC 11.4.0 upgrade from as a prerequisite since libsanitizer in GCC 11.3.0 fails to build with glibc 2.38. Ludo’. Greg Hogan (1): gnu: gcc@11: Update to 11.4.0. Ludovic Courtès (4): gnu: glibc-utf8-locales: Generalize and use gexps. DRAFT gnu: glibc: Update to 2.38. gnu: glibc: Install C.UTF-8 locale. gnu: glibc: Ensure C.UTF-8 locale is always found. gnu/local.mk | 2 +- gnu/packages/base.scm | 143 ++++++++++++------ gnu/packages/gcc.scm | 7 +- .../gcc-10-tree-sra-union-handling.patch | 33 ---- .../glibc-2.37-versioned-locpath.patch | 57 ++++--- .../patches/glibc-2.38-ldd-x86_64.patch | 8 + 6 files changed, 138 insertions(+), 112 deletions(-) delete mode 100644 gnu/packages/patches/gcc-10-tree-sra-union-handling.patch create mode 100644 gnu/packages/patches/glibc-2.38-ldd-x86_64.patch base-commit: 69d31a158001f2cb97983bd13f4575f6c9484451 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 07 05:23:25 2023 Received: (at 67686) by debbugs.gnu.org; 7 Dec 2023 10:23:25 +0000 Received: from localhost ([127.0.0.1]:41132 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBBXQ-0005VV-DF for submit@debbugs.gnu.org; Thu, 07 Dec 2023 05:23:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50314) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBBXN-0005Us-VY for 67686@debbugs.gnu.org; Thu, 07 Dec 2023 05:23:22 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBBX6-0000ip-0z; Thu, 07 Dec 2023 05:23:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=o5lm29u3kq0AyVzCzbv5mf+7qxpSo/bBkobyLg0FW5k=; b=XAB+xWhlaJQRWxwpfPk2 PF/BBLxKEsMba7L5Y/i5ndt+tHUnCDIkszZbOgS1nGGFZRXfCdFCBjSIAOu6JTmx4ltJZ8G1+xtks uHkvhPVARL7AE9M1lxhE2WTI/X6keBp4O8jsJ+brSW55YAQhMsO+lvwsup84Ad8RDJsGLh8DDrdyk jw0uqbkVoLAZU/jyGmJ0Dx3qe67nuJe0wWCsGVa35WTB+huwIOw8aewo9SLxVPAnkJ9ZklxyOHyvb PsDcHR97kb/iD4+DFKfNAJWwap6qMkoaYPSMchezAnkfSPAGfefh9+2DkKKbFMRy71N2Hz9V0/OWy eoDiSfjilb/TZA==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 67686@debbugs.gnu.org Subject: [PATCH core-updates 1/5] gnu: gcc@11: Update to 11.4.0. Date: Thu, 7 Dec 2023 11:22:44 +0100 Message-ID: <84287ec2c97471228f0b4e1db1ae14b155bbde88.1701943221.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 67686 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= , Greg Hogan 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 (---) From: Greg Hogan * gnu/packages/gcc.scm (gcc-11): Update to 11.4.0. Remove ‘gcc-10-tree-sra-union-handling.patch’. * gnu/local.mk: Delist patch. * gnu/packages/patches/gcc-10-tree-sra-union-handling.patch: Delete. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 - gnu/packages/gcc.scm | 7 ++-- .../gcc-10-tree-sra-union-handling.patch | 33 ------------------- 3 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 gnu/packages/patches/gcc-10-tree-sra-union-handling.patch diff --git a/gnu/local.mk b/gnu/local.mk index ce850c9f7e..f1839319c8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1250,7 +1250,6 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-10-cross-environment-variables.patch \ %D%/packages/patches/gcc-11-libstdc++-hurd-libpthread.patch \ %D%/packages/patches/gcc-12-cross-environment-variables.patch \ - %D%/packages/patches/gcc-10-tree-sra-union-handling.patch \ %D%/packages/patches/gcc-11-libstdc++-powerpc.patch \ %D%/packages/patches/gcc-13.2.0-libstdc++-docbook-xsl-uri.patch \ %D%/packages/patches/gcc-13.2.0-libstdc++-info-install-fix.patch \ diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 3137fe2d75..313a92d8aa 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -719,17 +719,16 @@ (define-public gcc-10 (define-public gcc-11 (package (inherit gcc-8) - (version "11.3.0") + (version "11.4.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gcc/gcc-" version "/gcc-" version ".tar.xz")) (sha256 (base32 - "0fdclcwf728wbq52vphfcjywzhpsjp3kifzj3pib3xcihs0z4z5l")) + "1ncd7akww0hl5kkmw1dj3qgqp3phdrr5dfnm7jia9s07n0ib4b9z")) (patches (search-patches "gcc-9-strmov-store-file-names.patch" - "gcc-5.0-libvtv-runpath.patch" - "gcc-10-tree-sra-union-handling.patch")) + "gcc-5.0-libvtv-runpath.patch")) (modules '((guix build utils))) (snippet gcc-canadian-cross-objdump-snippet))) (arguments diff --git a/gnu/packages/patches/gcc-10-tree-sra-union-handling.patch b/gnu/packages/patches/gcc-10-tree-sra-union-handling.patch deleted file mode 100644 index aae5fc9f72..0000000000 --- a/gnu/packages/patches/gcc-10-tree-sra-union-handling.patch +++ /dev/null @@ -1,33 +0,0 @@ -Fix a regression in GCC 10/11/12 where some union structures -could get miscompiled when optimizations are enabled: - - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105860 - -Taken from upstream: - - https://gcc.gnu.org/g:16afe2e2862f3dd93c711d7f8d436dee23c6c34d - -diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c -index 09d951a261b..420329f63f6 100644 ---- a/gcc/tree-sra.c -+++ b/gcc/tree-sra.c -@@ -1647,7 +1647,18 @@ build_ref_for_offset (location_t loc, tree base, poly_int64 offset, - static tree - build_reconstructed_reference (location_t, tree base, struct access *model) - { -- tree expr = model->expr, prev_expr = NULL; -+ tree expr = model->expr; -+ /* We have to make sure to start just below the outermost union. */ -+ tree start_expr = expr; -+ while (handled_component_p (expr)) -+ { -+ if (TREE_CODE (TREE_TYPE (TREE_OPERAND (expr, 0))) == UNION_TYPE) -+ start_expr = expr; -+ expr = TREE_OPERAND (expr, 0); -+ } -+ -+ expr = start_expr; -+ tree prev_expr = NULL_TREE; - while (!types_compatible_p (TREE_TYPE (expr), TREE_TYPE (base))) - { - if (!handled_component_p (expr)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 07 05:23:25 2023 Received: (at 67686) by debbugs.gnu.org; 7 Dec 2023 10:23:25 +0000 Received: from localhost ([127.0.0.1]:41136 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBBXR-0005VY-4K for submit@debbugs.gnu.org; Thu, 07 Dec 2023 05:23:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50328) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBBXO-0005Uu-HH for 67686@debbugs.gnu.org; Thu, 07 Dec 2023 05:23:22 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBBX6-0000jD-VC; Thu, 07 Dec 2023 05:23:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=f2+/BbyoT/DtobZNx3pL0z1LDDF2Y7AMEH40nL5ySkw=; b=EsmhjB/n3MIbyjSfUhjc LoPnGAAtK5oDiPo6hhFvh702nukJjUlwmvdJ7UxPgWLEGcNCTehIAzGrQlHyfbIr/TFGhIAdY3/7j YyR+CoDuPLaFosbYTtfwekIy5bN0YqW3tau65q8chFttYJARHPVh31OprdI8OFK+v0RzQ8CS/edan nv/jXs2EPFgAlJ5BoitIFhcMERZA2Zd35bUthPpNovWyX79GRiFHf687tPHRinINaT18qa0SrNcUc O8KMgHrFF3A+Mlj1DyM7ekv+sAHF6vZgXqjncC892vEZmwABG+1l6glqw28+2lyhE3MPoYoDm83RM V1JwQoUQ7WXpVw==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 67686@debbugs.gnu.org Subject: [PATCH core-updates 2/5] gnu: glibc-utf8-locales: Generalize and use gexps. Date: Thu, 7 Dec 2023 11:22:45 +0100 Message-ID: <614bd1b35c61d23a3de82c292cf3f55d52b56b29.1701943221.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 67686 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 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 (---) Previously code was dependent on the ‘name’ field of the GLIBC package. * gnu/packages/base.scm (make-glibc-utf8-locales): Use gexps. Replace references to ‘%build-inputs’ by calls to ‘which’. Replace reference to ‘version’ by (package-version this-package). Change-Id: I1e7003047aa85df74069b233191ab331b5f887b6 --- gnu/packages/base.scm | 67 +++++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 31 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index b4982107b2..f95ae1b679 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1348,47 +1348,52 @@ (define %default-utf8-locales (define*-public (make-glibc-utf8-locales glibc #:key (locales %default-utf8-locales) (name "glibc-utf8-locales")) - (define default-locales? (equal? locales %default-utf8-locales)) + (define default-locales? + (equal? locales %default-utf8-locales)) + (package (name name) (version (package-version glibc)) (source #f) (build-system trivial-build-system) (arguments - `(#:modules ((guix build utils)) - #:builder (begin - (use-modules (guix build utils)) + (list #:modules '((guix build utils)) + #:builder + #~(begin + (use-modules (guix build utils)) - (let* ((libc (assoc-ref %build-inputs "glibc")) - (gzip (assoc-ref %build-inputs "gzip")) - (out (assoc-ref %outputs "out")) - (localedir (string-append out "/lib/locale/" - ,(version-major+minor version)))) - ;; 'localedef' needs 'gzip'. - (setenv "PATH" (string-append libc "/bin:" gzip "/bin")) + (let* ((libc (dirname + (search-input-file %build-inputs + "/bin/localedef"))) + (gzip (dirname + (search-input-file %build-inputs + "/bin/gzip"))) + (out #$output) + (localedir (string-append out "/lib/locale/" + #$(version-major+minor + (package-version this-package))))) + ;; 'localedef' needs 'gzip'. + (setenv "PATH" (string-append libc ":" gzip "")) - (mkdir-p localedir) - (for-each (lambda (locale) - (define file - ;; Use the "normalized codeset" by - ;; default--e.g., "en_US.utf8". - (string-append localedir "/" locale ".utf8")) + (mkdir-p localedir) + (for-each (lambda (locale) + (define file + ;; Use the "normalized codeset" by + ;; default--e.g., "en_US.utf8". + (string-append localedir "/" locale ".utf8")) - (invoke "localedef" "--no-archive" - "--prefix" localedir - "-i" locale - "-f" "UTF-8" file) + (invoke "localedef" "--no-archive" + "--prefix" localedir + "-i" locale + "-f" "UTF-8" file) - ;; For backward compatibility with Guix - ;; <= 0.8.3, add "xx_YY.UTF-8". - (symlink (string-append locale ".utf8") - (string-append localedir "/" - locale ".UTF-8"))) - ',locales) - #t)))) - (native-inputs - `(("glibc" ,glibc) - ("gzip" ,gzip))) + ;; For backward compatibility with Guix + ;; <= 0.8.3, add "xx_YY.UTF-8". + (symlink (string-append locale ".utf8") + (string-append localedir "/" + locale ".UTF-8"))) + '#$locales))))) + (native-inputs (list glibc gzip)) (synopsis (if default-locales? (P_ "Small sample of UTF-8 locales") (P_ "Customized sample of UTF-8 locales"))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 07 05:23:27 2023 Received: (at 67686) by debbugs.gnu.org; 7 Dec 2023 10:23:27 +0000 Received: from localhost ([127.0.0.1]:41140 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBBXS-0005Vr-Ou for submit@debbugs.gnu.org; Thu, 07 Dec 2023 05:23:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50344) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBBXP-0005V1-IL for 67686@debbugs.gnu.org; Thu, 07 Dec 2023 05:23:24 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBBX8-0000jd-0W; Thu, 07 Dec 2023 05:23:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=vFUd7SUJugLvTfqfcu8BjJb0fOyZyRT/vW5y8U8tcWI=; b=EfTW9SFlTGVi01/NH5pt s4LNLXJ3EOQE/b5/iLCdm8349+p8Blc8FF9AhU+ZOpyPQElf0BM41IHcjg2hbkGkZxcbQgVmGFMSz xAk0oPnvCMN1GhtVfwiOzqMAs4n7jVa9jwzX3gbLoxcoArv44u5LcxdfkYyO9kNCYNO1K4bT+ZP62 4a0jmxoWSIoycMgAmnzWIwGW4Y0/c4NJAJSA95DWlRlFu+xy3kCYQHN1bYAhkzfe4fe8G2T0htJMF 1gT88zIWu9eXRkf94MT8c1Geq4i4dh/9KbM4cgzd1H7G61w/EwIuvTmzq8wD/zCLJsuT5NVLdaL5N 62cbkGBsKYgVbg==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 67686@debbugs.gnu.org Subject: [PATCH core-updates 3/5] DRAFT gnu: glibc: Update to 2.38. Date: Thu, 7 Dec 2023 11:22:46 +0100 Message-ID: <591e6131c16d1d54dfa23291b35bffca81551956.1701943221.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 67686 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 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 (---) DRAFT: Two questions: 1. Can we abandon ‘glibc-allow-kernel-2.6.32’ (CentOS 6)? 2. Check cross-compilation. * gnu/packages/patches/glibc-2.38-ldd-x86_64.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/base.scm (glibc): Update to 2.38. [source]: Adjust list of patches. [arguments]: Add ‘--enable-crypt’. (glibc-2.35): New variable. Change-Id: I040b724c47d2ee5f90f2deb03a4828e79d1bfc4e --- gnu/local.mk | 1 + gnu/packages/base.scm | 47 +++++++++++++++---- .../glibc-2.37-versioned-locpath.patch | 35 +++----------- .../patches/glibc-2.38-ldd-x86_64.patch | 8 ++++ 4 files changed, 52 insertions(+), 39 deletions(-) create mode 100644 gnu/packages/patches/glibc-2.38-ldd-x86_64.patch diff --git a/gnu/local.mk b/gnu/local.mk index f1839319c8..7ecc828003 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1304,6 +1304,7 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-2.37-hurd-clock_t_centiseconds.patch \ %D%/packages/patches/glibc-2.37-hurd-local-clock_gettime_MONOTONIC.patch \ %D%/packages/patches/glibc-2.37-versioned-locpath.patch \ + %D%/packages/patches/glibc-2.38-ldd-x86_64.patch \ %D%/packages/patches/glibc-hurd-clock_t_centiseconds.patch \ %D%/packages/patches/glibc-hurd-getauxval.patch \ %D%/packages/patches/glibc-hurd-gettyent.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index f95ae1b679..c5eac8a2da 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -795,26 +795,25 @@ (define-public glibc ;; version 2.28, GNU/Hurd used a different glibc branch. (package (name "glibc") - (version "2.35") + (version "2.38") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz")) (sha256 (base32 - "0bpm1kfi09dxl4c6aanc5c9951fmf6ckkzay60cx7k37dcpp68si")) + "1lizxxqbfma5zgmcj0gk5iyk171f2nfvdhbv8rjrkcmjk24rk0pv")) (patches (search-patches "glibc-ldd-powerpc.patch" - "glibc-ldd-x86_64.patch" + "glibc-2.38-ldd-x86_64.patch" "glibc-dl-cache.patch" - "glibc-versioned-locpath.patch" - "glibc-allow-kernel-2.6.32.patch" + "glibc-2.37-versioned-locpath.patch" + ;; "glibc-allow-kernel-2.6.32.patch" "glibc-reinstate-prlimit64-fallback.patch" "glibc-supported-locales.patch" - "glibc-cross-objdump.patch" - "glibc-cross-objcopy.patch" ;must come 2nd - "glibc-hurd-clock_t_centiseconds.patch" - "glibc-hurd-clock_gettime_monotonic.patch" + "glibc-2.37-hurd-clock_t_centiseconds.patch" + "glibc-2.37-hurd-local-clock_gettime_MONOTONIC.patch" "glibc-hurd-mach-print.patch" - "glibc-hurd-gettyent.patch")))) + "glibc-hurd-gettyent.patch" + "glibc-hurd-getauxval.patch")))) (build-system gnu-build-system) ;; Glibc's refers to , for instance, so glibc @@ -876,6 +875,10 @@ (define-public glibc "kernel-headers") "/include") + ;; Libcrypt and are deprecated in glibc 2.38 and not + ;; built by default. Build it to reduce application breakage. + "--enable-crypt" + ;; This is the default for most architectures as of GNU libc 2.26, ;; but we specify it explicitly for clarity and consistency. See ;; "kernel-features.h" in the GNU libc for details. @@ -1083,6 +1086,30 @@ (define-public glibc-for-fhs ;; Below are old libc versions, which we use mostly to build locale data in ;; the old format (which the new libc cannot cope with.) +(define-public glibc-2.35 + (package + (inherit glibc) + (version "2.35") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz")) + (sha256 + (base32 + "0bpm1kfi09dxl4c6aanc5c9951fmf6ckkzay60cx7k37dcpp68si")) + (patches (search-patches "glibc-ldd-powerpc.patch" + "glibc-ldd-x86_64.patch" + "glibc-dl-cache.patch" + "glibc-versioned-locpath.patch" + "glibc-allow-kernel-2.6.32.patch" + "glibc-reinstate-prlimit64-fallback.patch" + "glibc-supported-locales.patch" + "glibc-cross-objdump.patch" + "glibc-cross-objcopy.patch" ;must come 2nd + "glibc-hurd-clock_t_centiseconds.patch" + "glibc-hurd-clock_gettime_monotonic.patch" + "glibc-hurd-mach-print.patch" + "glibc-hurd-gettyent.patch")))))) + (define-public glibc-2.33 (package (inherit glibc) diff --git a/gnu/packages/patches/glibc-2.37-versioned-locpath.patch b/gnu/packages/patches/glibc-2.37-versioned-locpath.patch index 0acaeb1e46..8685f2c3b7 100644 --- a/gnu/packages/patches/glibc-2.37-versioned-locpath.patch +++ b/gnu/packages/patches/glibc-2.37-versioned-locpath.patch @@ -1,11 +1,3 @@ -From d73ba2caa10b8e9f51ff4239cc32eeb4e0de4279 Mon Sep 17 00:00:00 2001 -Message-Id: -From: Josselin Poiret -Date: Sat, 13 May 2023 14:10:43 +0200 -Subject: [PATCH] Add versioned locpath - -From: Josselin Poiret - The format of locale data can be incompatible between libc versions, and loading incompatible data can lead to 'setlocale' returning EINVAL at best or triggering an assertion failure at worst. See @@ -20,20 +12,8 @@ that variable. So, if GUIX_LOCPATH=/foo:/bar, locale data is searched for in That way, a single 'GUIX_LOCPATH' setting can work even if different libc versions coexist on the system. - -This patch is adapted from the 2.35 patch. - ---- - locale/newlocale.c | 15 ++-------- - locale/setlocale.c | 68 +++++++++++++++++++++++++++++++++++++------- - string/Makefile | 1 + - string/argz-suffix.c | 56 ++++++++++++++++++++++++++++++++++++ - string/argz.h | 10 +++++++ - 5 files changed, 127 insertions(+), 23 deletions(-) - create mode 100644 string/argz-suffix.c - diff --git a/locale/newlocale.c b/locale/newlocale.c -index 108d2428bf..6218e0fa77 100644 +index 108d2428..6218e0fa 100644 --- a/locale/newlocale.c +++ b/locale/newlocale.c @@ -29,6 +29,7 @@ @@ -73,7 +53,7 @@ index 108d2428bf..6218e0fa77 100644 /* Get the names for the locales we are interested in. We either allow a composite name or a single name. */ diff --git a/locale/setlocale.c b/locale/setlocale.c -index dd73fa4248..d8eb799384 100644 +index 6a902faa..2d07a644 100644 --- a/locale/setlocale.c +++ b/locale/setlocale.c @@ -213,12 +213,65 @@ setdata (int category, struct __locale_data *data) @@ -143,7 +123,7 @@ index dd73fa4248..d8eb799384 100644 char *composite; /* Sanity check for CATEGORY argument. */ -@@ -249,17 +302,10 @@ setlocale (int category, const char *locale) +@@ -249,17 +308,10 @@ setlocale (int category, const char *locale) locale_path = NULL; locale_path_len = 0; @@ -165,7 +145,7 @@ index dd73fa4248..d8eb799384 100644 if (category == LC_ALL) diff --git a/string/Makefile b/string/Makefile -index 3eced0d027..a7e68729ad 100644 +index 8cdfd5b0..6b0d606d 100644 --- a/string/Makefile +++ b/string/Makefile @@ -51,6 +51,7 @@ routines := \ @@ -178,7 +158,7 @@ index 3eced0d027..a7e68729ad 100644 bzero \ diff --git a/string/argz-suffix.c b/string/argz-suffix.c new file mode 100644 -index 0000000000..505b0f248c +index 00000000..505b0f24 --- /dev/null +++ b/string/argz-suffix.c @@ -0,0 +1,56 @@ @@ -239,7 +219,7 @@ index 0000000000..505b0f248c +} +weak_alias (__argz_suffix_entries, argz_suffix_entries) diff --git a/string/argz.h b/string/argz.h -index cbc588a8e6..bc6e484c9d 100644 +index cbc588a8..bc6e484c 100644 --- a/string/argz.h +++ b/string/argz.h @@ -108,6 +108,16 @@ extern error_t argz_replace (char **__restrict __argz, @@ -259,6 +239,3 @@ index cbc588a8e6..bc6e484c9d 100644 /* Returns the next entry in ARGZ & ARGZ_LEN after ENTRY, or NULL if there are no more. If entry is NULL, then the first entry is returned. This --- -2.40.1 - diff --git a/gnu/packages/patches/glibc-2.38-ldd-x86_64.patch b/gnu/packages/patches/glibc-2.38-ldd-x86_64.patch new file mode 100644 index 0000000000..9db412b5f2 --- /dev/null +++ b/gnu/packages/patches/glibc-2.38-ldd-x86_64.patch @@ -0,0 +1,8 @@ +By default, 'RTDLLIST' in 'ldd' refers to 'lib64/ld-linux-x86-64.so', whereas +it's in 'lib/' for us. This patch fixes that. + +--- glibc-2.38/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed ++++ glibc-2.38/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed +@@ -1 +1 @@ +-s_^\(RTLDLIST=\)\(.*lib\)\(\|64\|x32\)\(/[^/]*\)\(-x86-64\|-x32\)\(\.so\.[0-9.]*\)[ ]*$_\1"\2\4\6 \264\4-x86-64\6 \2x32\4-x32\6"_ ++s_^\(RTLDLIST=\)\(.*lib\)\(\|64\|x32\)\(/[^/]*\)\(-x86-64\|-x32\)\(\.so\.[0-9.]*\)[ ]*$_\1"\2\4\6 \2\4-x86-64\6 \2x32\4-x32\6"_ -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 07 05:23:28 2023 Received: (at 67686) by debbugs.gnu.org; 7 Dec 2023 10:23:28 +0000 Received: from localhost ([127.0.0.1]:41142 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBBXT-0005Vu-JU for submit@debbugs.gnu.org; Thu, 07 Dec 2023 05:23:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50360) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBBXQ-0005V8-ER for 67686@debbugs.gnu.org; Thu, 07 Dec 2023 05:23:25 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBBX8-0000jl-Sv; Thu, 07 Dec 2023 05:23:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=1skVc+kvZNGky2oS9HwHoWJxB++14V6eOs/KLgm4kSY=; b=e4O91J0qahgxk7ghV5b/ cQSI1xE8vblD3ddjEvx3TUQZ39o4EKxl7aaE7roGhxQMmOir0RDMwNWdEFKtLZfT9CT17qmqDSKO7 5MoSPb6KCYTmpvWjBzZjWmvnmAAWUm+FhtF60/f/sZuDj+S6yJYWyKOkZ52Gug+jYEU5QUiH9Ykb3 021V2ow0tvXncmGlh0GsOJ/qI8hE/Qvq4eWivUmzth43gWc8NXMYhY9JIflq+0eFhi0hWj8XI0ISA Ml1TiniBsopZ9eqS7iozHqXcjWTDDnwK2uZvGczyz3E3aIWWpfoCMp/zlH7TIed05NvkhkzbDYGLz 0bU2ZHGTEr94tw==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 67686@debbugs.gnu.org Subject: [PATCH core-updates 4/5] gnu: glibc: Install C.UTF-8 locale. Date: Thu, 7 Dec 2023 11:22:47 +0100 Message-ID: <3e187cf8646059a513b502a17abe9f88daae6f6b.1701943221.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 67686 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 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 (---) * gnu/packages/base.scm (glibc)[arguments]: Add ‘install-utf8-c-locale’ phase. (glibc-2.35)[arguments]: Delete ‘install-utf8-c-locale’ phase. (glibc-2.33, glibc-2.32, glibc-2.31): Inherit from ‘glibc-2.35’. Change-Id: I7ba515184c7b7c40eaefd355639ffef8eeca66d8 --- gnu/packages/base.scm | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index c5eac8a2da..985cd627fe 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1023,6 +1023,21 @@ (define-public glibc (map (cut string-append slib "/" <>) files)))))) + (add-after 'install 'install-utf8-c-locale + (lambda* (#:key outputs #:allow-other-keys) + ;; Install the C.UTF-8 locale so there's always a UTF-8 + ;; locale around. + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (locale (string-append out "/lib/locale/" + ,(package-version + this-package)))) + (mkdir-p locale) + (invoke (string-append bin "/localedef") + "--no-archive" "--prefix" locale + "-i" "C" "-f" "UTF-8" + (string-append locale "/C.UTF-8"))))) + ,@(if (target-hurd?) '((add-after 'install 'augment-libc.so (lambda* (#:key outputs #:allow-other-keys) @@ -1108,11 +1123,19 @@ (define-public glibc-2.35 "glibc-hurd-clock_t_centiseconds.patch" "glibc-hurd-clock_gettime_monotonic.patch" "glibc-hurd-mach-print.patch" - "glibc-hurd-gettyent.patch")))))) + "glibc-hurd-gettyent.patch")))) + (arguments + (substitute-keyword-arguments (package-arguments glibc) + ((#:phases phases) + ;; The C.UTF-8 fails to build in glibc 2.35: + ;; . + ;; It is missing altogether in versions earlier than 2.35. + `(modify-phases ,phases + (delete 'install-utf8-c-locale))))))) (define-public glibc-2.33 (package - (inherit glibc) + (inherit glibc-2.35) (name "glibc") (version "2.33") (source (origin @@ -1139,7 +1162,7 @@ (define-public glibc-2.33 (define-public glibc-2.32 (package - (inherit glibc) + (inherit glibc-2.35) (version "2.32") (source (origin (inherit (package-source glibc)) @@ -1194,7 +1217,7 @@ (define-public glibc-2.32 (define-public glibc-2.31 (package - (inherit glibc) + (inherit glibc-2.35) (version "2.31") (source (origin (inherit (package-source glibc)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 07 05:23:32 2023 Received: (at 67686) by debbugs.gnu.org; 7 Dec 2023 10:23:32 +0000 Received: from localhost ([127.0.0.1]:41144 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBBXX-0005WF-9h for submit@debbugs.gnu.org; Thu, 07 Dec 2023 05:23:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50362) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBBXR-0005VB-Br for 67686@debbugs.gnu.org; Thu, 07 Dec 2023 05:23:28 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBBX9-0000jr-PX; Thu, 07 Dec 2023 05:23:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=GPCEuBEsb/Vzau7AXdU6qmjDYauLbiHQxHOYBDuSKLo=; b=Ul0widRDrV15dPsunlvu K+fxpTU4EzZ7cA5hDT4vPoXjOBRCNRl4xZ4wMNCVPNVOaOvPKt4P+MY5gvPG6HWZCiaSjkLW4w3oq I0C6D0AWQ1IkwalAq0ICyDkaqyPRba77aVuQNQfieUc5iEgKkmXWipNhmJo7REjTgxmBvTHGaUD5Y PGuSHdcDgdIojgVDP7aeRbOa22qX0B/RQSIKn3asSSdCysBrG7X1MJBMokR1thKp/FCCNq/una6ZQ WG3Z48R/1UZBGyCBNP1xWZqVap/6jXdC0MFUxt0Tkpl5NH8WSC9FSgrAJ6JkAr6P/0PXcEhCS45VB D7vDdqWm+d+Ugw==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 67686@debbugs.gnu.org Subject: [PATCH core-updates 5/5] gnu: glibc: Ensure C.UTF-8 locale is always found. Date: Thu, 7 Dec 2023 11:22:48 +0100 Message-ID: <26b8d546eb51e3ef25c160a1e18b4ecb45206540.1701943221.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 67686 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 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 (---) This change ensures that $prefix/lib/locale, which now contains C.UTF-8 data, is always searched. Thus, “setlocale (LC_ALL, "C.UTF-8")” is guaranteed to always succeed. * gnu/packages/patches/glibc-2.37-versioned-locpath.patch: Adjust. Change-Id: I6aaf2757da98e811aa55e0959126065537cd8970 --- .../glibc-2.37-versioned-locpath.patch | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/gnu/packages/patches/glibc-2.37-versioned-locpath.patch b/gnu/packages/patches/glibc-2.37-versioned-locpath.patch index 8685f2c3b7..1f34292ad0 100644 --- a/gnu/packages/patches/glibc-2.37-versioned-locpath.patch +++ b/gnu/packages/patches/glibc-2.37-versioned-locpath.patch @@ -12,6 +12,20 @@ that variable. So, if GUIX_LOCPATH=/foo:/bar, locale data is searched for in That way, a single 'GUIX_LOCPATH' setting can work even if different libc versions coexist on the system. +diff --git a/locale/Makefile b/locale/Makefile +index d7036b08..b5125166 100644 +--- a/locale/Makefile ++++ b/locale/Makefile +@@ -94,7 +94,9 @@ localepath = "$(complocaledir):$(i18ndir)" + # -Iprograms doesn't really belong here, but this gets it at the head + # of the list instead of the tail, where CPPFLAGS-$(lib) gets added. + # We need it before the standard -I's to see programs/config.h first. ++# Define 'LOCALEDIR' for use in 'compute_locale_search_path'. + locale-CPPFLAGS = -DCOMPLOCALEDIR='"$(complocaledir)"' \ ++ -DLOCALEDIR='"$(libdir)/locale"' \ + -DLOCALE_ALIAS_PATH='"$(localedir)"' \ + -Iprograms + diff --git a/locale/newlocale.c b/locale/newlocale.c index 108d2428..6218e0fa 100644 --- a/locale/newlocale.c @@ -56,7 +70,7 @@ diff --git a/locale/setlocale.c b/locale/setlocale.c index 6a902faa..2d07a644 100644 --- a/locale/setlocale.c +++ b/locale/setlocale.c -@@ -213,12 +213,65 @@ setdata (int category, struct __locale_data *data) +@@ -213,12 +213,71 @@ setdata (int category, struct __locale_data *data) } } @@ -104,6 +118,12 @@ index 6a902faa..2d07a644 100644 + goto bail_out; + } + ++ /* Last, unconditionally append our own locale directory, which should ++ contain data for C.UTF-8. */ ++ if (__argz_add_sep (locale_path, locale_path_len, ++ LOCALEDIR "/" VERSION, ':') != 0) ++ goto bail_out; ++ + return 0; + + bail_out: -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 07 05:31:17 2023 Received: (at 67686) by debbugs.gnu.org; 7 Dec 2023 10:31:17 +0000 Received: from localhost ([127.0.0.1]:41168 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBBf2-0005jv-Qy for submit@debbugs.gnu.org; Thu, 07 Dec 2023 05:31:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35424) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBBez-0005jh-CC for 67686@debbugs.gnu.org; Thu, 07 Dec 2023 05:31:15 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBBeh-0002Pp-C8 for 67686@debbugs.gnu.org; Thu, 07 Dec 2023 05:30:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=ZSbbXu3wcanmzJZoqi4N+uKCkCTu0eMNx6Rt2iIuuBo=; b=JS5sfvp1CKdNb05GtLrr NKiQXfY66OY2+rQ1TojAirV4OgvTXXhUSpr97q8fNsqhXjxggyG2yl9AxhS+cHVB5gZ/Lemi/b7oY EmPqePlDRk9QPCdAd+P7MgmRvK+IxIKF4axPJ7AgAVK64EIB9ZmMYc0m68VuU7RXxXDl13q4ladzN tWIMjWI4GXMo2Vjh3pLdlPPH4sTzRgOVPX4qjSCrp02IXGLwRwv0JWR7fVxGlRTYxvHDf4XIhUTcf FiZ9gyxrmBSepp33Z8IFN1m5Yp3w3HNYNyi7skhEPk0s/qAK7REzwmjzk3NDfj1PWM9XowiGuOHtL Y+4updlpFoUxrA==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: 67686@debbugs.gnu.org Subject: Re: [bug#67686] [PATCH core-updates 4/5] gnu: glibc: Install C.UTF-8 locale. In-Reply-To: <3e187cf8646059a513b502a17abe9f88daae6f6b.1701943221.git.ludo@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s=22's?= message of "Thu, 7 Dec 2023 11:22:47 +0100") References: <3e187cf8646059a513b502a17abe9f88daae6f6b.1701943221.git.ludo@gnu.org> Date: Thu, 07 Dec 2023 11:30:10 +0100 Message-ID: <87v89ae24t.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 67686 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 (---) Ludovic Court=C3=A8s skribis: > + ;; Install the C.UTF-8 locale so there's always a U= TF-8 > + ;; locale around. > + (let* ((out (assoc-ref outputs "out")) > + (bin (string-append out "/bin")) > + (locale (string-append out "/lib/locale/" > + ,(package-version > + this-package)))) > + (mkdir-p locale) > + (invoke (string-append bin "/localedef") > + "--no-archive" "--prefix" locale > + "-i" "C" "-f" "UTF-8" > + (string-append locale "/C.UTF-8"))))) I realize now that this cannot work when cross-compiling, because the this =E2=80=98localedef=E2=80=99 binary is not executable on the build mach= ine. I suspect libc builds an additional =E2=80=98localedef=E2=80=99 for the bui= ld machine but I=E2=80=99m not sure where it is, hmm=E2=80=A6 Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 07 15:12:23 2023 Received: (at 67686) by debbugs.gnu.org; 7 Dec 2023 20:12:23 +0000 Received: from localhost ([127.0.0.1]:43215 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBKjO-000722-TU for submit@debbugs.gnu.org; Thu, 07 Dec 2023 15:12:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48528) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBKjK-00071g-Gs for 67686@debbugs.gnu.org; Thu, 07 Dec 2023 15:12:21 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBKj1-000427-9X; Thu, 07 Dec 2023 15:11:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=xpLE8uM/pyr1EJZ7nBsFXwz+LT9sHXdyXh9tNGmgJX8=; b=nrjNNlEZoxMHfhYlAIxO BbxfdfwMNQJVrHtt+i2b0k/hGEhLXdQdtOfm3Pqd0XlrraBq0rrIGI59NSPKWvcXhpn6djmgsAnFa Lp1lvW72ewa6YcRbUcbO+I6AJ4ZdLwys6X/+Eccwj7usAfNyKAViDhpUl3LxxEtGhF1dy3RWpPev1 A5dnRs0XZ1oBJmdaQT9QHI0zy62lco5YRFjl2jlOgPMq/kUELUSIbDWh8tcsVpN+afCxIWkDb1LB3 mMzCIFAkTnVSxyvE39V//5kZcIpo6gHMRLFdV9XcUycZnn3hHqcIP5ECyMOOh8IIDm1PDBdHZB811 cf1ZKVX26g7lRQ==; From: Janneke Nieuwenhuizen To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#67686] [PATCH core-updates 1/5] gnu: gcc@11: Update to 11.4.0. In-Reply-To: <84287ec2c97471228f0b4e1db1ae14b155bbde88.1701943221.git.ludo@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s=22's?= message of "Thu, 7 Dec 2023 11:22:44 +0100") Organization: AvatarAcademy.nl References: <84287ec2c97471228f0b4e1db1ae14b155bbde88.1701943221.git.ludo@gnu.org> X-Url: http://AvatarAcademy.nl Date: Thu, 07 Dec 2023 21:11:54 +0100 Message-ID: <8734wd93hx.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 67686 Cc: 67686@debbugs.gnu.org, Greg Hogan 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; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > From: Greg Hogan > > * gnu/packages/gcc.scm (gcc-11): Update to 11.4.0. > Remove =E2=80=98gcc-10-tree-sra-union-handling.patch=E2=80=99. > * gnu/local.mk: Delist patch. > * gnu/packages/patches/gcc-10-tree-sra-union-handling.patch: Delete. [On core-updates] this patch is still used, I recommend the attatched squash commit. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-squash-gnu-gcc-11-Update-to-11.4.0.patch >From aa0896545b283adc2c7451bbccca2b391a5affb8 Mon Sep 17 00:00:00 2001 Message-ID: From: Janneke Nieuwenhuizen Date: Thu, 7 Dec 2023 21:04:31 +0100 Subject: [PATCH] squash! gnu: gcc@11: Update to 11.4.0. Do not remove and delist this patch, it's still used by gcc-10. * gnu/packages/patches/gcc-10-tree-sra-union-handling.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Change-Id: Iff8c9151326c87cb13db9c5b1a00c44b8eef95e3 --- gnu/local.mk | 1 + .../gcc-10-tree-sra-union-handling.patch | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 gnu/packages/patches/gcc-10-tree-sra-union-handling.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7ecc828003..231488a1be 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1250,6 +1250,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-10-cross-environment-variables.patch \ %D%/packages/patches/gcc-11-libstdc++-hurd-libpthread.patch \ %D%/packages/patches/gcc-12-cross-environment-variables.patch \ + %D%/packages/patches/gcc-10-tree-sra-union-handling.patch \ %D%/packages/patches/gcc-11-libstdc++-powerpc.patch \ %D%/packages/patches/gcc-13.2.0-libstdc++-docbook-xsl-uri.patch \ %D%/packages/patches/gcc-13.2.0-libstdc++-info-install-fix.patch \ diff --git a/gnu/packages/patches/gcc-10-tree-sra-union-handling.patch b/gnu/packages/patches/gcc-10-tree-sra-union-handling.patch new file mode 100644 index 0000000000..aae5fc9f72 --- /dev/null +++ b/gnu/packages/patches/gcc-10-tree-sra-union-handling.patch @@ -0,0 +1,33 @@ +Fix a regression in GCC 10/11/12 where some union structures +could get miscompiled when optimizations are enabled: + + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105860 + +Taken from upstream: + + https://gcc.gnu.org/g:16afe2e2862f3dd93c711d7f8d436dee23c6c34d + +diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c +index 09d951a261b..420329f63f6 100644 +--- a/gcc/tree-sra.c ++++ b/gcc/tree-sra.c +@@ -1647,7 +1647,18 @@ build_ref_for_offset (location_t loc, tree base, poly_int64 offset, + static tree + build_reconstructed_reference (location_t, tree base, struct access *model) + { +- tree expr = model->expr, prev_expr = NULL; ++ tree expr = model->expr; ++ /* We have to make sure to start just below the outermost union. */ ++ tree start_expr = expr; ++ while (handled_component_p (expr)) ++ { ++ if (TREE_CODE (TREE_TYPE (TREE_OPERAND (expr, 0))) == UNION_TYPE) ++ start_expr = expr; ++ expr = TREE_OPERAND (expr, 0); ++ } ++ ++ expr = start_expr; ++ tree prev_expr = NULL_TREE; + while (!types_compatible_p (TREE_TYPE (expr), TREE_TYPE (base))) + { + if (!handled_component_p (expr)) base-commit: 941456404cc52da9492836150cbcfa44f6a476e7 -- 2.41.0 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 07 15:31:41 2023 Received: (at 67686) by debbugs.gnu.org; 7 Dec 2023 20:31:41 +0000 Received: from localhost ([127.0.0.1]:43226 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBL24-0001pr-JF for submit@debbugs.gnu.org; Thu, 07 Dec 2023 15:31:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36586) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBL21-0001pW-Bw for 67686@debbugs.gnu.org; Thu, 07 Dec 2023 15:31:39 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBL1i-0002ga-Tt; Thu, 07 Dec 2023 15:31:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=hgWGHCPIRkupX44tiDMfHGlhZl+gzGa/PCMJjgF3M2Q=; b=GMdQXdRagMLlbn8/2Nl9 0eG6zHU4ccPDH4BT6ZiZxwM6CS0kXAm4NhQu+wJHQcxh7/W/e8GNgHx3SLVZe1qXRlanyzYdobFzw q27BVl+Q/65VvrlQhJ/7h6uFcu+ZnsBzLMiAvgdVW0U/C6BUER5V0RiHZmfWDryZxj1mlMiQ9ZytB 9TaeMgXWl3gB5g8mL20n/mXgPlBN5EMTyad2KXm8nDGMV3tl1eDbqdVhsFP5vhsNlyv1pZCPCySaA 5Hu5tpj8n+fkUt6CB3ezUgopAWSMAPB2PY40qVO1UUj5FS0PujOshvOJVzss0JHHbhGjeU1sKmKOH 5S/Ncsiyy9QCvQ==; From: Janneke Nieuwenhuizen To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#67686] [PATCH core-updates 4/5] gnu: glibc: Install C.UTF-8 locale. In-Reply-To: <87v89ae24t.fsf@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?= =?utf-8?Q?s?= message of "Thu, 07 Dec 2023 11:30:10 +0100") Organization: AvatarAcademy.nl References: <3e187cf8646059a513b502a17abe9f88daae6f6b.1701943221.git.ludo@gnu.org> <87v89ae24t.fsf@gnu.org> X-Url: http://AvatarAcademy.nl Date: Thu, 07 Dec 2023 21:31:14 +0100 Message-ID: <87wmtp7o19.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 67686 Cc: 67686@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; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: Hello! > Ludovic Court=C3=A8s skribis: > >> + ;; Install the C.UTF-8 locale so there's always a = UTF-8 >> + ;; locale around. >> + (let* ((out (assoc-ref outputs "out")) >> + (bin (string-append out "/bin")) >> + (locale (string-append out "/lib/locale/" >> + ,(package-version >> + this-package)))) >> + (mkdir-p locale) >> + (invoke (string-append bin "/localedef") >> + "--no-archive" "--prefix" locale >> + "-i" "C" "-f" "UTF-8" >> + (string-append locale "/C.UTF-8"))))) > > I realize now that this cannot work when cross-compiling, because the > this =E2=80=98localedef=E2=80=99 binary is not executable on the build ma= chine. > > I suspect libc builds an additional =E2=80=98localedef=E2=80=99 for the b= uild machine > but I=E2=80=99m not sure where it is, hmm=E2=80=A6 So far, I haven't encountered this problem yet. Trying to create a hurd image with this patch set, but mpfr fails for me. --8<---------------cut here---------------start------------->8--- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D MPFR 4.2.0: tests/test-suite.log =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # TOTAL: 197 # PASS: 196 # SKIP: 0 # XFAIL: 0 # FAIL: 1 # XPASS: 0 # ERROR: 0 .. contents:: :depth: 2 FAIL: tsprintf =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Error in mpfr_vsprintf (s, "%0+ -'13.10Pd:", ...); expected: "+01,234,567 :" got: "+0001,234,567:" FAIL tsprintf (exit status: 1) --8<---------------cut here---------------end--------------->8--- Updating to 4.2.1 (see attached patch) seems to fix it for me. Greetings, Janneke --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-mpfr-Update-to-4.2.1.patch >From e8b5a6c064b0395ca84749987c97dd9e1172b9ab Mon Sep 17 00:00:00 2001 Message-ID: From: Janneke Nieuwenhuizen Date: Thu, 7 Dec 2023 21:28:24 +0100 Subject: [PATCH] gnu: mpfr: Update to 4.2.1. This fixes building mpfr with glibc-2.38. * gnu/packages/multiprecision.scm (mpfr): Update to 4.2.1. Change-Id: Ib8a8eecc9e72587e0fc1b8b0ee965aa274b85c7b --- gnu/packages/multiprecision.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index 3aa5dccfab..3d11523a07 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -120,13 +120,13 @@ (define-public gmp-6.0 (define-public mpfr (package (name "mpfr") - (version "4.2.0") + (version "4.2.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mpfr/mpfr-" version ".tar.xz")) (sha256 (base32 - "14yr4sf4mys64nzbgnd997l6l4n8l9vsjnnvnb0lh4jh2ggpi8q6")))) + "1cnb3y7y351qg6r7ynwsgaykm7l2a8zg2nlljs4rf9k778shfy17")))) (arguments (list #:phases (if (system-hurd?) base-commit: 36a126b0580a2d3e01704db7bbe4c3c0da8356d3 -- 2.41.0 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 07 16:12:33 2023 Received: (at 67686) by debbugs.gnu.org; 7 Dec 2023 21:12:33 +0000 Received: from localhost ([127.0.0.1]:43247 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBLfc-0003Ef-QP for submit@debbugs.gnu.org; Thu, 07 Dec 2023 16:12:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43716) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBLfW-0003EK-Sj for 67686@debbugs.gnu.org; Thu, 07 Dec 2023 16:12:30 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBLfE-0000sy-TF; Thu, 07 Dec 2023 16:12:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=NN7FmHNZTNdiarqGvA7MjviERLQofph7PArSvqLY3CQ=; b=JjudsdH8On3xFh4Liipx j3BVCGm6imwlhuyhDJhbtj3vuoUOIk/O/khNPMdacAoi5nNWBB1MHYlkh3SzdzXMYQr86liGlMKn2 VeIpgHPORA5GvaTWvNiABmkvKc20TK4+78HNzStw1rzuXKtaEu9kd2cC6XENgFd/r5vGTRGmVle4I PlUjD5fqqFE1/BEjuKWHZLBF3XS0+2sDvghAHOg0G8Jm6nSYKEo07za/ly2QPDalvbW2GyGl4PO7O q3/EqVkuVRSPoJ60bfTQcdcEs+P95wdTdSPMttV/GA1pNIP+WYUMIMH31MSp18yUtzotxMJlWoq8K vYB4hmO8nqvXdQ==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Janneke Nieuwenhuizen Subject: Re: [bug#67686] [PATCH core-updates 4/5] gnu: glibc: Install C.UTF-8 locale. In-Reply-To: <87wmtp7o19.fsf@gnu.org> (Janneke Nieuwenhuizen's message of "Thu, 07 Dec 2023 21:31:14 +0100") References: <3e187cf8646059a513b502a17abe9f88daae6f6b.1701943221.git.ludo@gnu.org> <87v89ae24t.fsf@gnu.org> <87wmtp7o19.fsf@gnu.org> Date: Thu, 07 Dec 2023 22:12:06 +0100 Message-ID: <87v899d8ex.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 67686 Cc: 67686@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 (---) Hi! Janneke Nieuwenhuizen skribis: >>>From e8b5a6c064b0395ca84749987c97dd9e1172b9ab Mon Sep 17 00:00:00 2001 > Message-ID: > From: Janneke Nieuwenhuizen > Date: Thu, 7 Dec 2023 21:28:24 +0100 > Subject: [PATCH] gnu: mpfr: Update to 4.2.1. > > This fixes building mpfr with glibc-2.38. > > * gnu/packages/multiprecision.scm (mpfr): Update to 4.2.1. > > Change-Id: Ib8a8eecc9e72587e0fc1b8b0ee965aa274b85c7b Excellent, I added it to my branch (so we can eventually push the whole thing at once.) Thanks! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 07 16:13:43 2023 Received: (at 67686) by debbugs.gnu.org; 7 Dec 2023 21:13:43 +0000 Received: from localhost ([127.0.0.1]:43253 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBLgk-0003HE-NW for submit@debbugs.gnu.org; Thu, 07 Dec 2023 16:13:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51978) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBLgi-0003Gt-QX for 67686@debbugs.gnu.org; Thu, 07 Dec 2023 16:13:41 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBLgQ-0001lF-2v; Thu, 07 Dec 2023 16:13:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=W03tZMArws/O7TgzbHIpganqgCyruSU+aL104JzVRBM=; b=EUiLU9x3Z/TEq2Noag3k JMDcpJ374D9Z3rkCfK/jUUjReG76Qw3GyaMnjV800l3P9w6MAm46+k9QL4q6GH3UeA+8TF6YTVVXG JiLrE+54CPFJoimWDy1y+FpEcia0vwP50xo8UMTrdxKl1s7pMEApqN11g1YfhoQGJCOmVtDiGBKF4 S3SVFKUJjK8qslv25iYoAk1NE2cmPKvL48aILXhVpWwjZj8WepzUoS6LB+CZyiacEcWirkEgVc4NU Ouu82x6IvvcBzWhCCxc8tmDObKET5VaDgi5R/aUkfUWoJnfzjjpt/zo7uuPK3JOX+sswgzpe8jQZR IfWLcnbhOYjZtA==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Janneke Nieuwenhuizen Subject: Re: [bug#67686] [PATCH core-updates 1/5] gnu: gcc@11: Update to 11.4.0. In-Reply-To: <8734wd93hx.fsf@gnu.org> (Janneke Nieuwenhuizen's message of "Thu, 07 Dec 2023 21:11:54 +0100") References: <84287ec2c97471228f0b4e1db1ae14b155bbde88.1701943221.git.ludo@gnu.org> <8734wd93hx.fsf@gnu.org> Date: Thu, 07 Dec 2023 22:13:20 +0100 Message-ID: <87r0jxd8cv.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 67686 Cc: 67686@debbugs.gnu.org, Greg Hogan 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 (---) Janneke Nieuwenhuizen skribis: >>>From aa0896545b283adc2c7451bbccca2b391a5affb8 Mon Sep 17 00:00:00 2001 > Message-ID: > From: Janneke Nieuwenhuizen > Date: Thu, 7 Dec 2023 21:04:31 +0100 > Subject: [PATCH] squash! gnu: gcc@11: Update to 11.4.0. > > Do not remove and delist this patch, it's still used by gcc-10. > > * gnu/packages/patches/gcc-10-tree-sra-union-handling.patch: New file. > * gnu/local.mk (dist_patch_DATA): Add it. > > Change-Id: Iff8c9151326c87cb13db9c5b1a00c44b8eef95e3 Good catch, added! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 07 16:27:19 2023 Received: (at 67686) by debbugs.gnu.org; 7 Dec 2023 21:27:19 +0000 Received: from localhost ([127.0.0.1]:43267 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBLtu-0003eP-MU for submit@debbugs.gnu.org; Thu, 07 Dec 2023 16:27:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44526) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBLtl-0003e6-W4 for 67686@debbugs.gnu.org; Thu, 07 Dec 2023 16:27:18 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBLtT-0004Js-6s; Thu, 07 Dec 2023 16:26:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=xcQhQGlYep52sSgY0hpqnUgL7dohAAtv/JtC0OVe7co=; b=JbFTAK71kXvNqCzjJJP0 cyUVgE1mUtwB5ewz2a24+oMNR6tN9RZx4wD/oLVNzC3W6Rdf7KMaudvt6vAQCEwVCqh3HrQ2JdcqN uSEQN8+Cw3obyQxnvCxNEFEQW1dwQRq51olQmvYiqtDFiaPyZ38UQFx7Aii5aHk26NmNxgXKDk/fv Z42DCwle7wTgG8gEWkXZD3fSl9Vq5anKk+vxebmEynKsgYowCKDED//ZPh7ul60OzRPklnzAy7TkN SmlXYHKhDlncQGov2oGGZLTqCca6xG/XgStoQMd+zlW87IrgtsMqjFXZ+2MwgvCvKlfXOpx/7uvZn mkQqFHFLSpMbKw==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: 67686@debbugs.gnu.org Subject: Re: [bug#67686] [PATCH core-updates 4/5] gnu: glibc: Install C.UTF-8 locale. In-Reply-To: <87v89ae24t.fsf@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?= =?utf-8?Q?s?= message of "Thu, 07 Dec 2023 11:30:10 +0100") References: <3e187cf8646059a513b502a17abe9f88daae6f6b.1701943221.git.ludo@gnu.org> <87v89ae24t.fsf@gnu.org> Date: Thu, 07 Dec 2023 22:26:36 +0100 Message-ID: <87fs0dd7qr.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67686 Cc: Efraim Flashner 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 (---) Ludovic Court=C3=A8s skribis: > Ludovic Court=C3=A8s skribis: > >> + ;; Install the C.UTF-8 locale so there's always a = UTF-8 >> + ;; locale around. >> + (let* ((out (assoc-ref outputs "out")) >> + (bin (string-append out "/bin")) >> + (locale (string-append out "/lib/locale/" >> + ,(package-version >> + this-package)))) >> + (mkdir-p locale) >> + (invoke (string-append bin "/localedef") >> + "--no-archive" "--prefix" locale >> + "-i" "C" "-f" "UTF-8" >> + (string-append locale "/C.UTF-8"))))) > > I realize now that this cannot work when cross-compiling, because the > this =E2=80=98localedef=E2=80=99 binary is not executable on the build ma= chine. > > I suspect libc builds an additional =E2=80=98localedef=E2=80=99 for the b= uild machine > but I=E2=80=99m not sure where it is, hmm=E2=80=A6 I was told on #glibc that (1) there=E2=80=99s no =E2=80=98localedef=E2=80= =99 for the build machine produced during cross-compilation, and (2) that more generally, there=E2=80=99s no way to cross-build locale data, that endianness and other things may matter. I suspect #2 was about the locale archive and not locale data, because evidence suggests that locale data is system-independent: --8<---------------cut here---------------start------------->8--- $ for s in aarch64-linux powerpc64le-linux armhf-linux i686-linux ; do diff= -r $(guix build glibc-locales@2.35) $(guix build glibc-locales@2.35 -s "$s= ") && echo "$s same as x86_64-linux" ; done aarch64-linux same as x86_64-linux powerpc64le-linux same as x86_64-linux armhf-linux same as x86_64-linux i686-linux same as x86_64-linux $ guix describe guix 6e2dd51 repository URL: https://git.savannah.gnu.org/git/guix.git branch: master commit: 6e2dd51df5f3f51e9056dd4f2e1b036195ab3caa --8<---------------cut here---------------end--------------->8--- Efraim, could you check against powerpc-linux, which is the only big-endian target we +/- support? Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 07 17:10:03 2023 Received: (at 67686) by debbugs.gnu.org; 7 Dec 2023 22:10:03 +0000 Received: from localhost ([127.0.0.1]:43294 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBMZH-0005AL-5P for submit@debbugs.gnu.org; Thu, 07 Dec 2023 17:10:03 -0500 Received: from wolfsden.cz ([37.205.8.62]:37578) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBMZA-00059J-Uz; Thu, 07 Dec 2023 17:10:01 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id AF5AC25BA0C; Thu, 7 Dec 2023 22:09:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701986982; bh=WZsl582T5KvQmRx1U/BBg9YbKjbIfThkskuLf5mHBjA=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=CBziv2TSKuCbUZ1G+mkSolUch7AuEA/408imXZhS1fZmugNb31bYuoSkZsz2PoqZZ YkMr+HCiPUnjMua0vjebYdUgiDsW/7+HaygOvruNLJ34s9XM1ZfmjA5SSQj4Me+ZtQ 3g5e94CENz3xvUXW810nYdKBC+9myl8WOdFuzy4olkvb6uePiuuMrmKKO5GG0hrObx 67BisVsj8lC28dkVnYvJ9WIAxbMF9Y0S4Shm8UCiwLSCAySex32IEaeNkCreJ9OrPf Llv5g36/MFrWkNBX2uLNOq+hC4LYEKjXQnlje6JdDtpTHnlvYF3wzwZMMCc8FQ9Wr6 3QvDJAojb+NV6lcVlglPjw8cZ8lHS/zeND4N83HkQrhQ+mIX2HO2rdONqPv639ZuCh 2fhBrwYpTvExDlEdmuSrCbNcMnk94hyGobJF/0TqiA1QorzeiXwDAcoDwxCmFkcxjW sNJ2Ot6qsmTgpz+z2Yemb5XtfQWFIo6seUfN/ecfBPcbrXUigWnexWKqIP04S0VmD6 GsccmcHyKKUtg2xSGyHBvbGr/9gSXYwMkftSW5yaDvOS27+VPseXkSYMV/eu9TsV6m d9mxYXOPUrgWR3MR1Dg68+QaKbMnPBu+3wHPNZpeWMqsqL+WmbLaTeWycz6+xZAyDN FuGIJWSKUQ8ZcJJ5GwzXgR+M= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from localhost (unknown [146.70.134.143]) by wolfsden.cz (Postfix) with ESMTPSA id 776D825B2C8; Thu, 7 Dec 2023 22:09:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701986981; bh=WZsl582T5KvQmRx1U/BBg9YbKjbIfThkskuLf5mHBjA=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=lvNfrysgLEEhNIpcfIoq3LJBsfJ7CuI0R/1s5ZtRpx0V8rR5tJYzi7Xzjy1sCgO6/ L1VQYpC1J8/+dRRxSXB/zuoTaQBKElkDrjYbu8nfgemk+jZA0HS2JKNycMnO6anGef ePMADphNCzNy7kKsi2ST/GUyy8L3rP9ZDQ50gu6BLQlzhMvYg3LHdFGX5ag73uWJxJ QM8YYzBB4AMgYX13lbVg8iX90WEDQPSIN0KJcp9hITkpO0gs7OU2zqsqLPwaWDOrHu EEhGrc5Z0EdgPar9p1CLhIZ7cyuIE2CrjETZB0HLUovI6tVDkilD1fH5iNITowpBK8 XMT63fvre2zmL2/sel6iyUjhn1Jw1a+K3aQ2aCQyWLg6hvmd5Aumt9Om+OgJfkK3GL LH8YHP801F2mlrypZ4sqTGp84QyQdpwMtsfKV15+q9iBKdwHY8ei6UHC6da6f81w6p wQsr/eNVGQOhD2GrrARe+nAt2zvw1KCYLX4F0bHsF2n41kzMI0h8x1PK575kB+O1+v vL0YC7BZpoh9+TG7wb/JZ24dpdiQTYPjOlgC2dMuR+/QqRAR15Rymt379FZ9eaWkay NDy+qL43Lf9fiuny6lQiSL3AP25TJbDsZ8Jnmf9uplgrDc5UDm0wSpNcGPywfu5esM AuD9DXA/insHT5xX82ErVYnM= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 93edc5b3; Thu, 7 Dec 2023 22:09:40 +0000 (UTC) Date: Thu, 7 Dec 2023 23:09:40 +0100 From: Tomas Volf <~@wolfsden.cz> To: Ludovic =?iso-8859-1?Q?Court=E8s?= Subject: Re: bug#67044: C.utf8 locale cannot be built Message-ID: References: <87bkbex3bh.fsf@gnu.org> <87zfyme29z.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="IzmMhgESxZ6g9MVl" Content-Disposition: inline In-Reply-To: <87zfyme29z.fsf@gnu.org> X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 67686 Cc: 67044@debbugs.gnu.org, 67686@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: -0.8 (/) --IzmMhgESxZ6g9MVl Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi :) On 2023-12-07 11:27:04 +0100, Ludovic Court=C3=A8s wrote: > [..] > > I decided to give it a go: > > https://issues.guix.gnu.org/67686 > > Please do chime in and let me know what you think! Thanks to the detailed cover letter, now I understand the benefit, so I agr= ee it would make sense. I looked over the implementation, and it looks fine to m= e (I am not sure if I am qualified to do the review though :) ). I just have few notes: 1. > (glibc-2.35)[arguments]: Delete =E2=80=98install-utf8-c-locale=E2=80=99 p= hase. I do think 2.35 should install the locale as well. That would require to c= hange (invoke (string-append bin "/localedef") "--no-archive" "--prefix" locale "-i" "C" "-f" "UTF-8" (string-append locale "/C.UTF-8"))))) into (invoke (string-append bin "/localedef") "-c" "--no-archive" "--prefix" locale "-i" "C" "-f" "UTF-8" (string-append locale "/C.UTF-8"))))) however I think that is fine. I am using locale built like that and it wor= ks well. What is more, from the discussion under the other issue[0], that is exactly what is done during normal glibc build: > It turns out we ignore errors during the glibc build (--quiet -c). After that the drop of 'install-utf8-c-locale can be moved into some other version < 2.35. 2. I still believe it makes sense to add the -c also into the locale builder, because my understanding is that this change will not allow using (locale "C.utf8") in the operating-system definition (since that would still try to build it, and fail). If you are not opposed to the idea, I can send a patch if you would prefer = not to do it yourself. 3. > I suspect libc builds an additional =E2=80=98localedef=E2=80=99 for the b= uild machine but I=E2=80=99m > not sure where it is, hmm=E2=80=A6 I looked around a bit, and I am not sure that is true. There seems to be o= nly =2E/locale/localedef created. However, there is localedef inside gcc-toolc= hain's bin directory, and, of course, in the build glibc. I am not sure what are = the version requirements here, but I would expect at least the one provided by = glibc to be usable. Have a nice day, Tomas 0: https://sourceware.org/bugzilla/show_bug.cgi?id=3D28845 -- There are only two hard things in Computer Science: cache invalidation, naming things and off-by-one errors. --IzmMhgESxZ6g9MVl Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEt4NJs4wUfTYpiGikL7/ufbZ/wakFAmVyQqQACgkQL7/ufbZ/ wan7vA//RKpYBFeFpE6FNHWrCZwPhxNy/d/lna/1TCPdf1smFe1cwvkwGthh0DJF l8sqd9U5faEUeY58vpzZRHZ0kUJHfMKbzEzzCrB1OV8uw6fkY8RYVy9rRdSS8vrZ R3SKbFcYo8zHBcVGE2pve1MAY48TyqJY+EHOfz7XAb3osOMJt8E/JjSSmhBB8k8c 9cY0wUbACuTmViFagniR27/y3n3TAr3BHRDWRCXLtQx24/JjcQw8uWKFljemTwSk BHiNyzXxv1ajr63Bfy5txFSRmn2MkubOmohFjkTwD9ApG/J7VMPiRLS22mPgSv98 1qB9/BzQ/s/4ktP+V2+jqrvZRe33b8b6brHpwd9P7eNKvjcERiG6kyu0d3Otmbnc MsoCChne0Ao9gdKfkwJZq16aktpDCuyHXAP8jdvy1xLjREMInM2lmV+yR7EJJ7vE Srt05ckoFoPAvPSUEyCJNPC5i07nmEn9oODSXuZHpDWd1I1n1m27jgRzIT69j8Ua l3Hfi4xruGX+FsMaltrqPKnjRNyfseOp0CXhddZv8Lo8XPKh7wrdHG/7o8PF3pN1 KLbZFEXU9F8bAkK0DV3UNdDIKAH7R131ZsyjvPhG0UFknEXCbUJy1wLxiqlwYaJd yD++ZP+ZN4s+jtqmjUlbP1cEZFyffmYc1R3JQ8+mIHa2FcD515Q= =o7Za -----END PGP SIGNATURE----- --IzmMhgESxZ6g9MVl-- From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 07 17:55:11 2023 Received: (at 67686) by debbugs.gnu.org; 7 Dec 2023 22:55:11 +0000 Received: from localhost ([127.0.0.1]:43337 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBNGw-0006pe-7g for submit@debbugs.gnu.org; Thu, 07 Dec 2023 17:55:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43618) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBNGt-0006ol-3N for 67686@debbugs.gnu.org; Thu, 07 Dec 2023 17:55:08 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBNGb-0002J7-6g; Thu, 07 Dec 2023 17:54:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=f2+/BbyoT/DtobZNx3pL0z1LDDF2Y7AMEH40nL5ySkw=; b=KmSGZ4f4leMdCSznqLJi 5XLxvhI9QjS4/+7ZAm/6jFpP7453IbOptjYeV4sy64t/awbzYXZ/nQUGFfNKKjh/1oPq2c2JrrYIF ulmyGiuGyZrGIRt5MRqC5MWkUNnI46LdznM0IMCPP3u619ARR5pKLIT6lZFOQtWUQWs2OYzVMUNfp JWo5J8zbcUzjY8by+/lAvCnIC2QLP6j2w8PqFxQi62e7gYjcXnJVST0QPOuVY1axBNj0oN6IxkNc9 aImWq2Wk3ixgtIyPY9/KYRXVMxPB1WW3/XSV55yma75wRLJXiE7eMlKryqAlIaNrLLTNiiiBcCNkE yMCGliPHzqe2JQ==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 67686@debbugs.gnu.org Subject: [PATCH core-updates v2 2/7] gnu: glibc-utf8-locales: Generalize and use gexps. Date: Thu, 7 Dec 2023 23:54:05 +0100 Message-ID: <3ea04038b5842fc20281fa70288d3f94753d2174.1701989279.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 67686 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 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 (---) Previously code was dependent on the ‘name’ field of the GLIBC package. * gnu/packages/base.scm (make-glibc-utf8-locales): Use gexps. Replace references to ‘%build-inputs’ by calls to ‘which’. Replace reference to ‘version’ by (package-version this-package). Change-Id: I1e7003047aa85df74069b233191ab331b5f887b6 --- gnu/packages/base.scm | 67 +++++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 31 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index b4982107b2..f95ae1b679 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1348,47 +1348,52 @@ (define %default-utf8-locales (define*-public (make-glibc-utf8-locales glibc #:key (locales %default-utf8-locales) (name "glibc-utf8-locales")) - (define default-locales? (equal? locales %default-utf8-locales)) + (define default-locales? + (equal? locales %default-utf8-locales)) + (package (name name) (version (package-version glibc)) (source #f) (build-system trivial-build-system) (arguments - `(#:modules ((guix build utils)) - #:builder (begin - (use-modules (guix build utils)) + (list #:modules '((guix build utils)) + #:builder + #~(begin + (use-modules (guix build utils)) - (let* ((libc (assoc-ref %build-inputs "glibc")) - (gzip (assoc-ref %build-inputs "gzip")) - (out (assoc-ref %outputs "out")) - (localedir (string-append out "/lib/locale/" - ,(version-major+minor version)))) - ;; 'localedef' needs 'gzip'. - (setenv "PATH" (string-append libc "/bin:" gzip "/bin")) + (let* ((libc (dirname + (search-input-file %build-inputs + "/bin/localedef"))) + (gzip (dirname + (search-input-file %build-inputs + "/bin/gzip"))) + (out #$output) + (localedir (string-append out "/lib/locale/" + #$(version-major+minor + (package-version this-package))))) + ;; 'localedef' needs 'gzip'. + (setenv "PATH" (string-append libc ":" gzip "")) - (mkdir-p localedir) - (for-each (lambda (locale) - (define file - ;; Use the "normalized codeset" by - ;; default--e.g., "en_US.utf8". - (string-append localedir "/" locale ".utf8")) + (mkdir-p localedir) + (for-each (lambda (locale) + (define file + ;; Use the "normalized codeset" by + ;; default--e.g., "en_US.utf8". + (string-append localedir "/" locale ".utf8")) - (invoke "localedef" "--no-archive" - "--prefix" localedir - "-i" locale - "-f" "UTF-8" file) + (invoke "localedef" "--no-archive" + "--prefix" localedir + "-i" locale + "-f" "UTF-8" file) - ;; For backward compatibility with Guix - ;; <= 0.8.3, add "xx_YY.UTF-8". - (symlink (string-append locale ".utf8") - (string-append localedir "/" - locale ".UTF-8"))) - ',locales) - #t)))) - (native-inputs - `(("glibc" ,glibc) - ("gzip" ,gzip))) + ;; For backward compatibility with Guix + ;; <= 0.8.3, add "xx_YY.UTF-8". + (symlink (string-append locale ".utf8") + (string-append localedir "/" + locale ".UTF-8"))) + '#$locales))))) + (native-inputs (list glibc gzip)) (synopsis (if default-locales? (P_ "Small sample of UTF-8 locales") (P_ "Customized sample of UTF-8 locales"))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 07 17:55:13 2023 Received: (at 67686) by debbugs.gnu.org; 7 Dec 2023 22:55:13 +0000 Received: from localhost ([127.0.0.1]:43343 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBNGz-0006qC-2I for submit@debbugs.gnu.org; Thu, 07 Dec 2023 17:55:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43614) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBNGs-0006oQ-60 for 67686@debbugs.gnu.org; Thu, 07 Dec 2023 17:55:09 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBNGZ-0002Iq-7m; Thu, 07 Dec 2023 17:54:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=xjvHQVpvCqTFtJjdBan9O+3yWnJ5GIIQf3t5WVkLg1M=; b=gPlL8RITnddX56 95nvTinM1JcS4a2VnQmrJ0IlGpFQ2tVMizEF0jbCTrQAHtGIBMD8+UMVMBTXxkrs3YDdNHucloza2 aQoJ6Ho+fCC1hvS0o+eAp+3T08cCw2muGwhuB3I8hOa1oDAQi4SG6p9uXV6yHa/jrSHuuGWSPb8my 15V6u0ZRnpiPG9NSbdHJge66P4c789wu0Om7bI/Zi0xuHF9P3LkB8+Ddz+L2vVBaLnJg7GPVuIc15 2EZXEErdG8e9oZigzccVi1EAzxtwnVQLWhKcKKU8ySyDt2CdWGDrZte41+tmIhZCo0sNC8k41b9cK 97KzMP2YaxXWIl0X1n8A==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 67686@debbugs.gnu.org Subject: [PATCH core-updates v2 0/7] Update glibc to 2.38; make C.UTF-8 always available Date: Thu, 7 Dec 2023 23:54:03 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 X-Debbugs-Cc: Christopher Baines , Josselin Poiret , Mathieu Othacehe , Ricardo Wurmus , Tobias Geerinckx-Rice , Efraim Flashner , Ludovic Courtès , Janneke Nieuwenhuizen MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 67686 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 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 (---) Changes since v1: • The ‘install-utf8-c-locale’ phase now installs nothing when cross-compiling. Eventually, I’d like to (1) change the package to use gexps, and (2) use the native ‘localedef’ from ‘this-package’ to build locales when cross-compiling as this appears to do the job. • Incorporated the GCC and MPFR patches by Janneke. (Since we haven’t yet added a ‘core-packages’ team, I’m seeing people likely to be interested. :-)) Ludo’. Greg Hogan (1): gnu: gcc@11: Update to 11.4.0. Janneke Nieuwenhuizen (1): gnu: mpfr: Update to 4.2.1. Ludovic Courtès (5): gnu: glibc-utf8-locales: Generalize and use gexps. DRAFT gnu: glibc: Update to 2.38. gnu: glibc: Install C.UTF-8 locale. gnu: glibc: Ensure C.UTF-8 locale is always found. gnu: glibc: Improve handling of empty .a files. gnu/local.mk | 1 + gnu/packages/base.scm | 166 ++++++++++++------ gnu/packages/commencement.scm | 10 +- gnu/packages/gcc.scm | 7 +- gnu/packages/multiprecision.scm | 4 +- .../glibc-2.37-versioned-locpath.patch | 57 +++--- .../patches/glibc-2.38-ldd-x86_64.patch | 8 + 7 files changed, 152 insertions(+), 101 deletions(-) create mode 100644 gnu/packages/patches/glibc-2.38-ldd-x86_64.patch base-commit: 69d31a158001f2cb97983bd13f4575f6c9484451 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 07 17:55:13 2023 Received: (at 67686) by debbugs.gnu.org; 7 Dec 2023 22:55:14 +0000 Received: from localhost ([127.0.0.1]:43345 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBNGz-0006qF-FX for submit@debbugs.gnu.org; Thu, 07 Dec 2023 17:55:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43624) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBNGt-0006on-DH for 67686@debbugs.gnu.org; Thu, 07 Dec 2023 17:55:09 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBNGa-0002Iz-AX; Thu, 07 Dec 2023 17:54:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=bSYFlkOWym7oVdc3Y/vkjRwkxKwwrdwyL6EguB2VLgE=; b=bc1rgjLtaBRGUgZTP3ZB m3sKZym15L9+BZYl2C86Z0UK2RTedHalUwzHVnwrDbS2cCPLWgPbgIe3TcipbzpLBLvdKNtB48EVL sKA9dPnrHf2D5kO/3CC8v18MN0xCHyn+VaedWLe5QRq8S+RlDSW1LNUvKhmXfWFq11E576uos/kP6 gnsfj15n0hV3okBCu+6XFeWkrr25OMesipRavNb1IdUcY21w9sV6g2lyL4f+00RF2auvC9PLz7QkS lJHEpUOn1tTQRbyDrzrdMUmGp9fcYL5yI7cz0y0Iz7bl8mBrPLn4F2hOlygMte9T7sgTFM8ULSNYZ N9MHHFCNOg/3Xw==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 67686@debbugs.gnu.org Subject: [PATCH core-updates v2 1/7] gnu: gcc@11: Update to 11.4.0. Date: Thu, 7 Dec 2023 23:54:04 +0100 Message-ID: <22f06be9287e22272bf3f34b91e9711e29bea129.1701989279.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 67686 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= , Greg Hogan , Janneke Nieuwenhuizen 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 (---) From: Greg Hogan * gnu/packages/gcc.scm (gcc-11): Update to 11.4.0. Remove ‘gcc-10-tree-sra-union-handling.patch’. Change-Id: Iff8c9151326c87cb13db9c5b1a00c44b8eef95e3 Co-authored-by: Janneke Nieuwenhuizen Signed-off-by: Ludovic Courtès --- gnu/packages/gcc.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 3137fe2d75..313a92d8aa 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -719,17 +719,16 @@ (define-public gcc-10 (define-public gcc-11 (package (inherit gcc-8) - (version "11.3.0") + (version "11.4.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gcc/gcc-" version "/gcc-" version ".tar.xz")) (sha256 (base32 - "0fdclcwf728wbq52vphfcjywzhpsjp3kifzj3pib3xcihs0z4z5l")) + "1ncd7akww0hl5kkmw1dj3qgqp3phdrr5dfnm7jia9s07n0ib4b9z")) (patches (search-patches "gcc-9-strmov-store-file-names.patch" - "gcc-5.0-libvtv-runpath.patch" - "gcc-10-tree-sra-union-handling.patch")) + "gcc-5.0-libvtv-runpath.patch")) (modules '((guix build utils))) (snippet gcc-canadian-cross-objdump-snippet))) (arguments -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 07 17:55:14 2023 Received: (at 67686) by debbugs.gnu.org; 7 Dec 2023 22:55:14 +0000 Received: from localhost ([127.0.0.1]:43347 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBNGz-0006qL-Ra for submit@debbugs.gnu.org; Thu, 07 Dec 2023 17:55:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBNGu-0006op-3a for 67686@debbugs.gnu.org; Thu, 07 Dec 2023 17:55:10 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBNGc-0002JW-6x; Thu, 07 Dec 2023 17:54:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=xU31jwknrwm5dX8TsBkMbqFke0aKHLQWLjHhiLts7wI=; b=mClbCJGYqcQ389DeHiWT Vo/hdsePOPAbfL40l66I6gSyPFOrOXjjkQU7sTTXbNP+y4pPHPxUDaimNbsbqMecJk/3+sli1xolu gX9pW7y2rjGZ0TEjdEJMEbdsuya7ARKTAQkrHYPD5Mv53NOpr2wj3LRVWJ8mBpn1JwHHMtjYuyzeW Ot4sXIj7djUmrhaEedwPlp3+DDFGhDvDxAYBCsiwOQM/fOblUCuEuqKG1Vk0ZURxExl2JpLpJnq1y llDtQa4TTZb1InnabLE/JlCsD+6n2AwUuDGSLAgmQTUfTwxX3M8Pwspur671umiRk2iwL2GVdW3Ct dGRJ8OmUPZkWww==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 67686@debbugs.gnu.org Subject: [PATCH core-updates v2 3/7] gnu: mpfr: Update to 4.2.1. Date: Thu, 7 Dec 2023 23:54:06 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 67686 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= , Janneke Nieuwenhuizen 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 (---) From: Janneke Nieuwenhuizen This fixes building mpfr with glibc-2.38. * gnu/packages/multiprecision.scm (mpfr): Update to 4.2.1. Change-Id: Ib8a8eecc9e72587e0fc1b8b0ee965aa274b85c7b Signed-off-by: Ludovic Courtès --- gnu/packages/multiprecision.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index 3aa5dccfab..3d11523a07 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -120,13 +120,13 @@ (define-public gmp-6.0 (define-public mpfr (package (name "mpfr") - (version "4.2.0") + (version "4.2.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mpfr/mpfr-" version ".tar.xz")) (sha256 (base32 - "14yr4sf4mys64nzbgnd997l6l4n8l9vsjnnvnb0lh4jh2ggpi8q6")))) + "1cnb3y7y351qg6r7ynwsgaykm7l2a8zg2nlljs4rf9k778shfy17")))) (arguments (list #:phases (if (system-hurd?) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 07 17:55:15 2023 Received: (at 67686) by debbugs.gnu.org; 7 Dec 2023 22:55:15 +0000 Received: from localhost ([127.0.0.1]:43349 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBNH0-0006qT-6E for submit@debbugs.gnu.org; Thu, 07 Dec 2023 17:55:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56924) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBNGu-0006or-Uf for 67686@debbugs.gnu.org; Thu, 07 Dec 2023 17:55:10 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBNGd-0002Jf-2C; Thu, 07 Dec 2023 17:54:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=vcgqI7WrHhxCZsDjAtiU/MmN5Sg7UTDA/sbIjRyHthc=; b=klSKgPN4Z2rCTXtc+xWV lORpxGJMaSY/dQfEbXVmIog4JHRNr3MhkPQdpnqZwNiL9nZMbfK/FfCRBGIJoeNres3Rti//o08oV MfZnDi73LA6AZuxUfaBli1v36C5XMr2kry6BFBGRZUfxsZqKihehOF7Byo1SoFIDRPUtVut9oz5fb g+Y+7EBnv4aLmM7tDMmQRAzGXmCe8PHYOlz2EEik+dKpvue4UyTuCWDufCr3kEuKWsmiChj+C219P RFeFox56OngsUSjcxS9KdrrMr6WLdshBZ+ID9OdYcmnVtGli4q+x8/pU6FfWsDh0TvtlH4MPv3204 vb45nM8DetpyAQ==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 67686@debbugs.gnu.org Subject: [PATCH core-updates v2 4/7] DRAFT gnu: glibc: Update to 2.38. Date: Thu, 7 Dec 2023 23:54:07 +0100 Message-ID: <739f88b862b034289764f75e77fa6b438116d767.1701989279.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 67686 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 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 (---) DRAFT: Two questions: 1. Can we abandon ‘glibc-allow-kernel-2.6.32’ (CentOS 6)? 2. Check cross-compilation. * gnu/packages/patches/glibc-2.38-ldd-x86_64.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/base.scm (glibc): Update to 2.38. [source]: Adjust list of patches. [arguments]: Add ‘--enable-crypt’. (glibc-2.35): New variable. Change-Id: I040b724c47d2ee5f90f2deb03a4828e79d1bfc4e --- gnu/local.mk | 1 + gnu/packages/base.scm | 47 +++++++++++++++---- .../glibc-2.37-versioned-locpath.patch | 35 +++----------- .../patches/glibc-2.38-ldd-x86_64.patch | 8 ++++ 4 files changed, 52 insertions(+), 39 deletions(-) create mode 100644 gnu/packages/patches/glibc-2.38-ldd-x86_64.patch diff --git a/gnu/local.mk b/gnu/local.mk index ce850c9f7e..231488a1be 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1305,6 +1305,7 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-2.37-hurd-clock_t_centiseconds.patch \ %D%/packages/patches/glibc-2.37-hurd-local-clock_gettime_MONOTONIC.patch \ %D%/packages/patches/glibc-2.37-versioned-locpath.patch \ + %D%/packages/patches/glibc-2.38-ldd-x86_64.patch \ %D%/packages/patches/glibc-hurd-clock_t_centiseconds.patch \ %D%/packages/patches/glibc-hurd-getauxval.patch \ %D%/packages/patches/glibc-hurd-gettyent.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index f95ae1b679..c5eac8a2da 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -795,26 +795,25 @@ (define-public glibc ;; version 2.28, GNU/Hurd used a different glibc branch. (package (name "glibc") - (version "2.35") + (version "2.38") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz")) (sha256 (base32 - "0bpm1kfi09dxl4c6aanc5c9951fmf6ckkzay60cx7k37dcpp68si")) + "1lizxxqbfma5zgmcj0gk5iyk171f2nfvdhbv8rjrkcmjk24rk0pv")) (patches (search-patches "glibc-ldd-powerpc.patch" - "glibc-ldd-x86_64.patch" + "glibc-2.38-ldd-x86_64.patch" "glibc-dl-cache.patch" - "glibc-versioned-locpath.patch" - "glibc-allow-kernel-2.6.32.patch" + "glibc-2.37-versioned-locpath.patch" + ;; "glibc-allow-kernel-2.6.32.patch" "glibc-reinstate-prlimit64-fallback.patch" "glibc-supported-locales.patch" - "glibc-cross-objdump.patch" - "glibc-cross-objcopy.patch" ;must come 2nd - "glibc-hurd-clock_t_centiseconds.patch" - "glibc-hurd-clock_gettime_monotonic.patch" + "glibc-2.37-hurd-clock_t_centiseconds.patch" + "glibc-2.37-hurd-local-clock_gettime_MONOTONIC.patch" "glibc-hurd-mach-print.patch" - "glibc-hurd-gettyent.patch")))) + "glibc-hurd-gettyent.patch" + "glibc-hurd-getauxval.patch")))) (build-system gnu-build-system) ;; Glibc's refers to , for instance, so glibc @@ -876,6 +875,10 @@ (define-public glibc "kernel-headers") "/include") + ;; Libcrypt and are deprecated in glibc 2.38 and not + ;; built by default. Build it to reduce application breakage. + "--enable-crypt" + ;; This is the default for most architectures as of GNU libc 2.26, ;; but we specify it explicitly for clarity and consistency. See ;; "kernel-features.h" in the GNU libc for details. @@ -1083,6 +1086,30 @@ (define-public glibc-for-fhs ;; Below are old libc versions, which we use mostly to build locale data in ;; the old format (which the new libc cannot cope with.) +(define-public glibc-2.35 + (package + (inherit glibc) + (version "2.35") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz")) + (sha256 + (base32 + "0bpm1kfi09dxl4c6aanc5c9951fmf6ckkzay60cx7k37dcpp68si")) + (patches (search-patches "glibc-ldd-powerpc.patch" + "glibc-ldd-x86_64.patch" + "glibc-dl-cache.patch" + "glibc-versioned-locpath.patch" + "glibc-allow-kernel-2.6.32.patch" + "glibc-reinstate-prlimit64-fallback.patch" + "glibc-supported-locales.patch" + "glibc-cross-objdump.patch" + "glibc-cross-objcopy.patch" ;must come 2nd + "glibc-hurd-clock_t_centiseconds.patch" + "glibc-hurd-clock_gettime_monotonic.patch" + "glibc-hurd-mach-print.patch" + "glibc-hurd-gettyent.patch")))))) + (define-public glibc-2.33 (package (inherit glibc) diff --git a/gnu/packages/patches/glibc-2.37-versioned-locpath.patch b/gnu/packages/patches/glibc-2.37-versioned-locpath.patch index 0acaeb1e46..8685f2c3b7 100644 --- a/gnu/packages/patches/glibc-2.37-versioned-locpath.patch +++ b/gnu/packages/patches/glibc-2.37-versioned-locpath.patch @@ -1,11 +1,3 @@ -From d73ba2caa10b8e9f51ff4239cc32eeb4e0de4279 Mon Sep 17 00:00:00 2001 -Message-Id: -From: Josselin Poiret -Date: Sat, 13 May 2023 14:10:43 +0200 -Subject: [PATCH] Add versioned locpath - -From: Josselin Poiret - The format of locale data can be incompatible between libc versions, and loading incompatible data can lead to 'setlocale' returning EINVAL at best or triggering an assertion failure at worst. See @@ -20,20 +12,8 @@ that variable. So, if GUIX_LOCPATH=/foo:/bar, locale data is searched for in That way, a single 'GUIX_LOCPATH' setting can work even if different libc versions coexist on the system. - -This patch is adapted from the 2.35 patch. - ---- - locale/newlocale.c | 15 ++-------- - locale/setlocale.c | 68 +++++++++++++++++++++++++++++++++++++------- - string/Makefile | 1 + - string/argz-suffix.c | 56 ++++++++++++++++++++++++++++++++++++ - string/argz.h | 10 +++++++ - 5 files changed, 127 insertions(+), 23 deletions(-) - create mode 100644 string/argz-suffix.c - diff --git a/locale/newlocale.c b/locale/newlocale.c -index 108d2428bf..6218e0fa77 100644 +index 108d2428..6218e0fa 100644 --- a/locale/newlocale.c +++ b/locale/newlocale.c @@ -29,6 +29,7 @@ @@ -73,7 +53,7 @@ index 108d2428bf..6218e0fa77 100644 /* Get the names for the locales we are interested in. We either allow a composite name or a single name. */ diff --git a/locale/setlocale.c b/locale/setlocale.c -index dd73fa4248..d8eb799384 100644 +index 6a902faa..2d07a644 100644 --- a/locale/setlocale.c +++ b/locale/setlocale.c @@ -213,12 +213,65 @@ setdata (int category, struct __locale_data *data) @@ -143,7 +123,7 @@ index dd73fa4248..d8eb799384 100644 char *composite; /* Sanity check for CATEGORY argument. */ -@@ -249,17 +302,10 @@ setlocale (int category, const char *locale) +@@ -249,17 +308,10 @@ setlocale (int category, const char *locale) locale_path = NULL; locale_path_len = 0; @@ -165,7 +145,7 @@ index dd73fa4248..d8eb799384 100644 if (category == LC_ALL) diff --git a/string/Makefile b/string/Makefile -index 3eced0d027..a7e68729ad 100644 +index 8cdfd5b0..6b0d606d 100644 --- a/string/Makefile +++ b/string/Makefile @@ -51,6 +51,7 @@ routines := \ @@ -178,7 +158,7 @@ index 3eced0d027..a7e68729ad 100644 bzero \ diff --git a/string/argz-suffix.c b/string/argz-suffix.c new file mode 100644 -index 0000000000..505b0f248c +index 00000000..505b0f24 --- /dev/null +++ b/string/argz-suffix.c @@ -0,0 +1,56 @@ @@ -239,7 +219,7 @@ index 0000000000..505b0f248c +} +weak_alias (__argz_suffix_entries, argz_suffix_entries) diff --git a/string/argz.h b/string/argz.h -index cbc588a8e6..bc6e484c9d 100644 +index cbc588a8..bc6e484c 100644 --- a/string/argz.h +++ b/string/argz.h @@ -108,6 +108,16 @@ extern error_t argz_replace (char **__restrict __argz, @@ -259,6 +239,3 @@ index cbc588a8e6..bc6e484c9d 100644 /* Returns the next entry in ARGZ & ARGZ_LEN after ENTRY, or NULL if there are no more. If entry is NULL, then the first entry is returned. This --- -2.40.1 - diff --git a/gnu/packages/patches/glibc-2.38-ldd-x86_64.patch b/gnu/packages/patches/glibc-2.38-ldd-x86_64.patch new file mode 100644 index 0000000000..9db412b5f2 --- /dev/null +++ b/gnu/packages/patches/glibc-2.38-ldd-x86_64.patch @@ -0,0 +1,8 @@ +By default, 'RTDLLIST' in 'ldd' refers to 'lib64/ld-linux-x86-64.so', whereas +it's in 'lib/' for us. This patch fixes that. + +--- glibc-2.38/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed ++++ glibc-2.38/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed +@@ -1 +1 @@ +-s_^\(RTLDLIST=\)\(.*lib\)\(\|64\|x32\)\(/[^/]*\)\(-x86-64\|-x32\)\(\.so\.[0-9.]*\)[ ]*$_\1"\2\4\6 \264\4-x86-64\6 \2x32\4-x32\6"_ ++s_^\(RTLDLIST=\)\(.*lib\)\(\|64\|x32\)\(/[^/]*\)\(-x86-64\|-x32\)\(\.so\.[0-9.]*\)[ ]*$_\1"\2\4\6 \2\4-x86-64\6 \2x32\4-x32\6"_ -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 07 17:55:15 2023 Received: (at 67686) by debbugs.gnu.org; 7 Dec 2023 22:55:15 +0000 Received: from localhost ([127.0.0.1]:43351 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBNH0-0006qa-Vb for submit@debbugs.gnu.org; Thu, 07 Dec 2023 17:55:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBNGv-0006oy-QK for 67686@debbugs.gnu.org; Thu, 07 Dec 2023 17:55:10 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBNGd-0002Jp-U9; Thu, 07 Dec 2023 17:54:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=TAGGa/+6uQgdyewhkB0TaUum+9meBRMc9tHDsaF/b+g=; b=fq4aKYmjELrEcRcRCuc4 G1QJm9XYMizko2yP9L35Gb41Hi/GBfk4tJXasZTyiXk6paRODF/oOhDoXuy/PRzsZPBugJCnsZxIg lU9Rfk3lTRgTIU7GKBiQYAL26WkM6fP/3FG/yV8nEkDwcHexVWaLUobv5ny92frmqtAoGWlYePdBO DRepJQeDWfeL29WK32+oGJsgN0HT1Ou1RlOIklcR3mGXvkHgYbTsuAiP+b8U4ZO31iCM0C7ETc5vZ 9wHi2t+ST3XvISCc5uJ+mInhyodDtCKJil6fQW6dw6SqNc1/iaL73i2jPKpRP9EHGFq1WFTnnGBWA xSIEecELde6mNg==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 67686@debbugs.gnu.org Subject: [PATCH core-updates v2 5/7] gnu: glibc: Install C.UTF-8 locale. Date: Thu, 7 Dec 2023 23:54:08 +0100 Message-ID: <5380d8d651e2c9a927a8fb53132f6aa9c6132a7c.1701989279.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 67686 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 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 (---) * gnu/packages/base.scm (glibc)[arguments]: Add ‘install-utf8-c-locale’ phase. (glibc-2.35)[arguments]: Delete ‘install-utf8-c-locale’ phase. (glibc-2.33, glibc-2.32, glibc-2.31): Inherit from ‘glibc-2.35’. Change-Id: I7ba515184c7b7c40eaefd355639ffef8eeca66d8 --- gnu/packages/base.scm | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index c5eac8a2da..1144110309 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1023,6 +1023,26 @@ (define-public glibc (map (cut string-append slib "/" <>) files)))))) + (add-after 'install 'install-utf8-c-locale + (lambda* (#:key outputs #:allow-other-keys) + ;; Install the C.UTF-8 locale so there's always a UTF-8 + ;; locale around. + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (locale (string-append out "/lib/locale/" + ,(package-version + this-package)))) + (mkdir-p locale) + + ;; FIXME: When cross-compiling, attempt to use + ;; 'localedef' from the same libc version. + (invoke ,(if (%current-target-system) + "true" + '(string-append bin "/localedef")) + "--no-archive" "--prefix" locale + "-i" "C" "-f" "UTF-8" + (string-append locale "/C.UTF-8"))))) + ,@(if (target-hurd?) '((add-after 'install 'augment-libc.so (lambda* (#:key outputs #:allow-other-keys) @@ -1108,11 +1128,19 @@ (define-public glibc-2.35 "glibc-hurd-clock_t_centiseconds.patch" "glibc-hurd-clock_gettime_monotonic.patch" "glibc-hurd-mach-print.patch" - "glibc-hurd-gettyent.patch")))))) + "glibc-hurd-gettyent.patch")))) + (arguments + (substitute-keyword-arguments (package-arguments glibc) + ((#:phases phases) + ;; The C.UTF-8 fails to build in glibc 2.35: + ;; . + ;; It is missing altogether in versions earlier than 2.35. + `(modify-phases ,phases + (delete 'install-utf8-c-locale))))))) (define-public glibc-2.33 (package - (inherit glibc) + (inherit glibc-2.35) (name "glibc") (version "2.33") (source (origin @@ -1139,7 +1167,7 @@ (define-public glibc-2.33 (define-public glibc-2.32 (package - (inherit glibc) + (inherit glibc-2.35) (version "2.32") (source (origin (inherit (package-source glibc)) @@ -1194,7 +1222,7 @@ (define-public glibc-2.32 (define-public glibc-2.31 (package - (inherit glibc) + (inherit glibc-2.35) (version "2.31") (source (origin (inherit (package-source glibc)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 07 17:55:15 2023 Received: (at 67686) by debbugs.gnu.org; 7 Dec 2023 22:55:16 +0000 Received: from localhost ([127.0.0.1]:43353 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBNH1-0006qi-FW for submit@debbugs.gnu.org; Thu, 07 Dec 2023 17:55:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56946) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBNGw-0006p0-Ln for 67686@debbugs.gnu.org; Thu, 07 Dec 2023 17:55:11 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBNGe-0002Jw-Q0; Thu, 07 Dec 2023 17:54:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=GPCEuBEsb/Vzau7AXdU6qmjDYauLbiHQxHOYBDuSKLo=; b=ITNPirpMtxsRfgTTbzrQ IBJkPeG6F1Zn7Hh9Ff4g9SwW1ZyvA3FB92TVnS4NlvtYnxSnKp0AUT5y4tal781S59SrgSFyHGfm/ 7md+C489Gcg4wp1+/9bjTO0un4zE+z1uPU3E663XnKyh+wi9N4H1UL6DFRdneDSjSvmmSknnPH36o 7BB1Yv3l0GvOGpmvnA/IJEow3sXcN5D12yynl0Tee2ruACuUnJROI+MwWtuYfqC0hA5ypaJK5wI95 4DrEbtg/2uGiCZ/gquCsxAXhHy7jhCpWFc86OmwNwlOGdTnlksdjlE0D+o+bdtoSzeQCtOKil/b81 PdjSQbXYWRmaNg==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 67686@debbugs.gnu.org Subject: [PATCH core-updates v2 6/7] gnu: glibc: Ensure C.UTF-8 locale is always found. Date: Thu, 7 Dec 2023 23:54:09 +0100 Message-ID: <45f8dc327b923102ce8b915bb07a3f3dc016f6b2.1701989279.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 67686 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 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 (---) This change ensures that $prefix/lib/locale, which now contains C.UTF-8 data, is always searched. Thus, “setlocale (LC_ALL, "C.UTF-8")” is guaranteed to always succeed. * gnu/packages/patches/glibc-2.37-versioned-locpath.patch: Adjust. Change-Id: I6aaf2757da98e811aa55e0959126065537cd8970 --- .../glibc-2.37-versioned-locpath.patch | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/gnu/packages/patches/glibc-2.37-versioned-locpath.patch b/gnu/packages/patches/glibc-2.37-versioned-locpath.patch index 8685f2c3b7..1f34292ad0 100644 --- a/gnu/packages/patches/glibc-2.37-versioned-locpath.patch +++ b/gnu/packages/patches/glibc-2.37-versioned-locpath.patch @@ -12,6 +12,20 @@ that variable. So, if GUIX_LOCPATH=/foo:/bar, locale data is searched for in That way, a single 'GUIX_LOCPATH' setting can work even if different libc versions coexist on the system. +diff --git a/locale/Makefile b/locale/Makefile +index d7036b08..b5125166 100644 +--- a/locale/Makefile ++++ b/locale/Makefile +@@ -94,7 +94,9 @@ localepath = "$(complocaledir):$(i18ndir)" + # -Iprograms doesn't really belong here, but this gets it at the head + # of the list instead of the tail, where CPPFLAGS-$(lib) gets added. + # We need it before the standard -I's to see programs/config.h first. ++# Define 'LOCALEDIR' for use in 'compute_locale_search_path'. + locale-CPPFLAGS = -DCOMPLOCALEDIR='"$(complocaledir)"' \ ++ -DLOCALEDIR='"$(libdir)/locale"' \ + -DLOCALE_ALIAS_PATH='"$(localedir)"' \ + -Iprograms + diff --git a/locale/newlocale.c b/locale/newlocale.c index 108d2428..6218e0fa 100644 --- a/locale/newlocale.c @@ -56,7 +70,7 @@ diff --git a/locale/setlocale.c b/locale/setlocale.c index 6a902faa..2d07a644 100644 --- a/locale/setlocale.c +++ b/locale/setlocale.c -@@ -213,12 +213,65 @@ setdata (int category, struct __locale_data *data) +@@ -213,12 +213,71 @@ setdata (int category, struct __locale_data *data) } } @@ -104,6 +118,12 @@ index 6a902faa..2d07a644 100644 + goto bail_out; + } + ++ /* Last, unconditionally append our own locale directory, which should ++ contain data for C.UTF-8. */ ++ if (__argz_add_sep (locale_path, locale_path_len, ++ LOCALEDIR "/" VERSION, ':') != 0) ++ goto bail_out; ++ + return 0; + + bail_out: -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 07 17:55:16 2023 Received: (at 67686) by debbugs.gnu.org; 7 Dec 2023 22:55:16 +0000 Received: from localhost ([127.0.0.1]:43355 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBNH1-0006qr-UF for submit@debbugs.gnu.org; Thu, 07 Dec 2023 17:55:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56962) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBNGx-0006pB-IZ for 67686@debbugs.gnu.org; Thu, 07 Dec 2023 17:55:11 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBNGf-0002KA-MX; Thu, 07 Dec 2023 17:54:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=I4VvSDLlifodOFRQLF6uT8NNYME3xKVmABE/CmmAdC4=; b=g9q6jtkr9nOGFpE23xN7 tCysFavP39lnsL4YgevsPA6Rr/eCZCUVjlfb/RMZ7SXZuMRIYozT/DASIOs+RfEOO6QTF9EtbMcLS x8N55vglezN1YPxbIvGR42xll7Bah3IQyD6dcP9JpEc46Ofr3MUOW8fPmnYuF4yqI/RzSOghG61iJ zsZIjoQBqEm1sX+r2SS7j9eQP24HYnk3jF6qJumpuWDuljqGmP1LWamE76wQ04zp4VbEPnTMbMqoF cd4e+JBgvAoYxOIWZOCTXFaAGl+Igc2xp/68j1eaqb0mxooS9QF14AmoqH3vo+yfpuABcPAwScz2S lrQ4F/Qs5QOQzQ==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 67686@debbugs.gnu.org Subject: [PATCH core-updates v2 7/7] gnu: glibc: Improve handling of empty .a files. Date: Thu, 7 Dec 2023 23:54:10 +0100 Message-ID: <937aa63bbbbe688c12b9622150140f7739a63618.1701989279.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 67686 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 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 (---) This partially reverts 3b2de6529b9d77c8a74d431859a3ec334e9603c2, itself a followup to 25b30622b4a77cd4b2965b9d62fa310a22413d54. * gnu/packages/base.scm (glibc)[arguments]: In ‘move-static-libs’ phase, remove ‘empty-static-libraries’ variable and rewrite ‘empty-static-library?’ to check file type and size. * gnu/packages/commencement.scm (make-gcc-toolchain): Remove ‘copy-file’ call to create ‘librt.a’. Change-Id: I33c6825d5b1e6e790dfff494bac1da07d3389e77 --- gnu/packages/base.scm | 18 ++++++------------ gnu/packages/commencement.scm | 10 +--------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 1144110309..311d598c8e 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -968,19 +968,13 @@ (define-public glibc ;; and as such, it is useful to have these ".a" files in ;; OUT in addition to STATIC. - ;; XXX: It might be better to determine whether a static - ;; library is empty by some criterion (such as their file - ;; size equaling eight bytes) rather than hardcoding them - ;; by name. - - ;; XXX: We forgot librt.a for the current version! In - ;; the meantime, gcc-toolchain provides it, but remove - ;; that fix once librt.a is added here. - (define empty-static-libraries - '("libpthread.a" "libdl.a" "libutil.a" "libanl.a")) (define (empty-static-library? file) - (any (lambda (s) - (string=? file s)) empty-static-libraries)) + ;; Return true if FILE is an 'ar' archive with nothing + ;; beyond the header. + (let ((file (string-append (assoc-ref outputs "out") + "/lib/" file))) + (and (ar-file? file) + (= (stat:size (stat file)) 8)))) (define (static-library? file) ;; Return true if FILE is a static library. The diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 4ccbbb0881..6c0f295f30 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3569,15 +3569,7 @@ (define* (make-gcc-toolchain gcc "libc-debug"))) (union-build (assoc-ref %outputs "static") (list (assoc-ref %build-inputs - "libc-static"))) - ;; XXX Remove once an empty librt.a is added to - ;; libc:out. - (copy-file - (string-append (assoc-ref %outputs "out") - "/lib/libpthread.a") - (string-append (assoc-ref %outputs "out") - "/lib/librt.a")) - #t)))) + "libc-static"))))))) (native-search-paths (append (package-native-search-paths gcc) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 08 12:40:04 2023 Received: (at 67686) by debbugs.gnu.org; 8 Dec 2023 17:40:04 +0000 Received: from localhost ([127.0.0.1]:46005 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBepX-0000PW-ML for submit@debbugs.gnu.org; Fri, 08 Dec 2023 12:40:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33340) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBepU-0000On-HD for 67686@debbugs.gnu.org; Fri, 08 Dec 2023 12:40:02 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBepA-0000Ch-Mh; Fri, 08 Dec 2023 12:39:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=KoUrZqvyPvSKpMFQ5RTkWYb9MWOFCx4gtncy58jsc98=; b=c8vGZFD8dZj6gujzSUNW m5HzaVq6UXf21+xyfzTyDeg/wRCxVL53K+M3mPRFUupMP77qsPp/LNyj32ScFL8rq/oO55cvnpPpw uCIC/wf5dIirs/GcsrR2oFu0EQuOavCTcoq2lAmaPl54A2582DxvQenVfGyDI40SuOiNjHMPqJuYV Lpiso8HhXZIEu9v/VSuNm+3qUjZCGlZGY/3bpCa0DQXNMsFbhzRuG7c1/EqtU0BI2f5c4GRsafNkm CRyHG9LwwaSRDlAKh6rXXmQsZE0xf4sg3+tSKhqxjRTAmalGUFJNWvHrFvgK/UdYgIBeYz9aDlmgZ +2d6H5GrUI6ZyQ==; From: Janneke Nieuwenhuizen To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [PATCH core-updates v2 1/7] gnu: gcc@11: Update to 11.4.0. In-Reply-To: <22f06be9287e22272bf3f34b91e9711e29bea129.1701989279.git.ludo@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s=22's?= message of "Thu, 7 Dec 2023 23:54:04 +0100") Organization: AvatarAcademy.nl References: <22f06be9287e22272bf3f34b91e9711e29bea129.1701989279.git.ludo@gnu.org> X-Url: http://AvatarAcademy.nl Date: Fri, 08 Dec 2023 18:39:35 +0100 Message-ID: <87wmtoy4o8.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 67686 Cc: 67686@debbugs.gnu.org, Josselin Poiret 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 (---) Ludovic Court=C3=A8s writes: Hi, With v2 of this series, after doing (define glibc/hurd glibc),=20 trying to build a hurd-vm ./pre-inst-env guix system build --target=3Di586-pc-gnu gnu/system/exam= ples/bare-hurd.tmpl now fails building /gnu/store/4hf24xkj93zjbq9ymbzaprxh0myk975c-hurd-minimal-cross-i586-pc-= gnu-v0.9.git20230216.drv --8<---------------cut here---------------start------------->8--- i586-pc-gnu-gcc -std=3Dgnu99 -fgnu89-inline -Wall -g -O3 -fno-strict-aliasi= ng -g -O2 -I. -I.. -I../include -I../include -D_GNU_SOURCE -D_FILE_OFFSE= T_BITS=3D64 -DPACKAGE_NAME=3D\"GNU\ Hurd\" -DPACKAGE_TARNAME=3D\"hurd\" -D= PACKAGE_VERSION=3D\"0.9\" -DPACKAGE_STRING=3D\"GNU\ Hurd\ 0.9\" -DPACKAGE_B= UGREPORT=3D\"bug-hurd@gnu.org\" -DPACKAGE_URL=3D\"http://www.gnu.org/softwa= re/hurd/\" -DUTIME_NOW=3D-1 -DUTIME_OMIT=3D-2 -DSTDC_HEADERS=3D1 -DHAVE_SYS= _TYPES_H=3D1 -DHAVE_SYS_STAT_H=3D1 -DHAVE_STDLIB_H=3D1 -DHAVE_STRING_H=3D1 = -DHAVE_MEMORY_H=3D1 -DHAVE_STRINGS_H=3D1 -DHAVE_INTTYPES_H=3D1 -DHAVE_STDIN= T_H=3D1 -DHAVE_UNISTD_H=3D1 -DX11_PREFIX=3D\"\" -DHAVE_STRUCT_THREAD_SCHED_= INFO_LAST_PROCESSOR=3D1 -c -o wire.o wire.c make[1]: *** No rule to make target 'mach/default_pager.h', needed by 'port= info.o'. Stop. --8<---------------cut here---------------end--------------->8--- After upgrading hurd-headers to the latest tag, it fails building /gnu/store/5cw60kjg87zws8b39bnp7r7a8vgfhz2b-hurd-headers-cross-i586-pc-= gnu-v0.9.git20230912.drv in an even stranger way --8<---------------cut here---------------start------------->8--- checking for libio... no checking for file_exec_paths... (cached) no checking for exec_exec_paths... (cached) no checking for _hurd_exec_paths... (cached) no checking for _hurd_libc_proc_init... (cached) no checking for file_utimens... configure: error: link tests are not allowed a= fter AC_NO_EXECUTABLES --8<---------------cut here---------------end--------------->8--- ...according to config.log the compiler it cannot find . This is just a heads-up, not sure if it has anything to do with this series. Possibly all hurd sources need to be updated nicely, dunno :) Greetings, Janneke --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 09 09:47:25 2023 Received: (at 67686) by debbugs.gnu.org; 9 Dec 2023 14:47:25 +0000 Received: from localhost ([127.0.0.1]:47077 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rByc0-0001j4-TC for submit@debbugs.gnu.org; Sat, 09 Dec 2023 09:47:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36756) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rByby-0001io-Fm; Sat, 09 Dec 2023 09:47:23 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBybd-0008PP-H6; Sat, 09 Dec 2023 09:47:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=ZSxKFSk1/teDJUpYy6OBGbHJyD++o1QHJgxWH9DsQ8E=; b=I4jRiqKyGmeTxUUwLOmW o2jk36GNab9Ay6GbfRMiDfDXEQo3JHQUqleRme9UsG/3DLGqHroKAwDutVoMQciQwscCs3C0Ix1ve NfYp3quUoB/xkYLENP3Z/4L8CVva6MDRZSen2nvuWI7cRs+xZWExeLlQNnwlBgyXTLNbL1r6f1wwg 8QHGnWeiSWyEvXTpbkah9KBbcvKDfJmVb85aOyXhx9zZynsIf6SrYtB+I+3mP790mHdvHUqecoeY6 yseYsTLFhdSCQwUeBO0n0gm0hnbSWlL4eKzcTh7NccFtNu6ayrDX+SEs3z2IMf1a0qrVMOvDgXg+C zuAgwo3rPhu/hQ==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Tomas Volf <~@wolfsden.cz> Subject: Re: [bug#67686] bug#67044: C.utf8 locale cannot be built In-Reply-To: (Tomas Volf's message of "Thu, 7 Dec 2023 23:09:40 +0100") References: <87bkbex3bh.fsf@gnu.org> <87zfyme29z.fsf@gnu.org> Date: Sat, 09 Dec 2023 15:46:58 +0100 Message-ID: <87a5qj5t7h.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 67686 Cc: 67044@debbugs.gnu.org, 67686@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 (---) Hi Tomas, Tomas Volf <~@wolfsden.cz> skribis: >> (glibc-2.35)[arguments]: Delete =E2=80=98install-utf8-c-locale=E2=80=99 = phase. > > I do think 2.35 should install the locale as well. That would require to= change > > (invoke (string-append bin "/localedef") > "--no-archive" "--prefix" locale > "-i" "C" "-f" "UTF-8" > (string-append locale "/C.UTF-8"))))) > > into > > (invoke (string-append bin "/localedef") > "-c" "--no-archive" "--prefix" locale > "-i" "C" "-f" "UTF-8" > (string-append locale "/C.UTF-8"))))) > > however I think that is fine. I am using locale built like that and it w= orks > well. What is more, from the discussion under the other issue[0], that is > exactly what is done during normal glibc build: > >> It turns out we ignore errors during the glibc build (--quiet -c). > > After that the drop of 'install-utf8-c-locale can be moved into some other > version < 2.35. I=E2=80=99m a bit wary of using =E2=80=98-c=E2=80=99 (aka. =E2=80=98--force= =E2=80=99) unconditionally as this could hide real problems. But more importantly, I think it won=E2=80=99t matter whether glibc 2.35 sh= ips C.UTF-8 since it=E2=80=99s no longer going to be used, except for building = old locale data via =E2=80=98locale-libcs=E2=80=99. > 2. > > I still believe it makes sense to add the -c also into the locale builder, > because my understanding is that this change will not allow using (locale > "C.utf8") in the operating-system definition (since that would still try = to > build it, and fail). > > If you are not opposed to the idea, I can send a patch if you would prefe= r not > to do it yourself. No you=E2=80=99re right, we could add =E2=80=98-c=E2=80=99 to the code in (= gnu system locale), though perhaps it would be safer to do so only in the 2.35 + C.UTF-8 case. (We can do that independently of this patch.) > 3. > >> I suspect libc builds an additional =E2=80=98localedef=E2=80=99 for the = build machine but I=E2=80=99m >> not sure where it is, hmm=E2=80=A6 > > I looked around a bit, and I am not sure that is true. In the meantime I found that this is wrong indeed: https://issues.guix.gnu.org/67686#11 Thanks for your feedback! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 09 09:58:41 2023 Received: (at 67686-done) by debbugs.gnu.org; 9 Dec 2023 14:58:41 +0000 Received: from localhost ([127.0.0.1]:48741 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBymv-0002YQ-2S for submit@debbugs.gnu.org; Sat, 09 Dec 2023 09:58:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46796) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rByms-0002YC-V9 for 67686-done@debbugs.gnu.org; Sat, 09 Dec 2023 09:58:39 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBymY-0007eu-Sb; Sat, 09 Dec 2023 09:58:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=PcH6MhOrnDEbHTtf/qJ3Fa3eS55vyspzYiTOXxuQxyk=; b=MGa3m+40wMqTxaX370gN cSE9SJhO0RTH1+wWvaSEkpMlvFGaVVPMjN52Zx3Gz9evZ6oSbN2TtohWTcw8jpbBLeNtAE2eeSldX KdkX9tiH1gI+S2nkliJw0nk7LocxSpKcKytSlvTLP5PlKl52OhRcsA6OROnGk1wIp60+m9Onatw20 oVYMXk8IZDDD8nhk6Dcbypf1M5cJopkmHlPss/RvBQMbjDJPUYxRx3d/QpzisR7W36VP7rPhAXovd q7dV9SRILuDyYkhFUYR7giq+cDyMSHAXrk5mdZJI+K+UfigEUY4E620JLIWEsISKoVJGzTsJuZKvf xY66T2T/b15FFw==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: 67686-done@debbugs.gnu.org Subject: Re: [bug#67686] [PATCH core-updates v2 0/7] Update glibc to 2.38; make C.UTF-8 always available In-Reply-To: ("Ludovic =?utf-8?Q?Court?= =?utf-8?Q?=C3=A8s=22's?= message of "Thu, 7 Dec 2023 23:54:03 +0100") References: Date: Sat, 09 Dec 2023 15:58:16 +0100 Message-ID: <875y175son.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 67686-done Cc: Josselin Poiret , Mathieu Othacehe , Tobias Geerinckx-Rice , Efraim Flashner , Ricardo Wurmus , Christopher Baines , Janneke Nieuwenhuizen 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 (---) Hello! I=E2=80=99ve just pushed v2: 5bbddafeaa gnu: glibc: Improve handling of empty .a files. 1cebc334a7 gnu: glibc: Ensure C.UTF-8 locale is always found. c76e44396e gnu: glibc: Install C.UTF-8 locale. d5242a562e gnu: glibc: Update to 2.38. cd43baad60 gnu: mpfr: Update to 4.2.1. 3ea04038b5 gnu: glibc-utf8-locales: Generalize and use gexps. 22f06be928 gnu: gcc@11: Update to 11.4.0. I think it=E2=80=99s just the beginning of a journey :-) since we=E2=80=99l= l have to test and fix cross-compilation, and eventually investigate the (define glibc/hurd glibc) problems Janneke already reported. By pushing my hope is to get support from the build farms so we can test these higher-level issues without having to rebuild everything locally. Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 09 11:33:45 2023 Received: (at 67686) by debbugs.gnu.org; 9 Dec 2023 16:33:45 +0000 Received: from localhost ([127.0.0.1]:48804 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rC0Gv-0007ed-26 for submit@debbugs.gnu.org; Sat, 09 Dec 2023 11:33:45 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:53705) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rC0Gs-0007eO-CJ for 67686@debbugs.gnu.org; Sat, 09 Dec 2023 11:33:43 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-40c0e7b8a9bso40996325e9.3 for <67686@debbugs.gnu.org>; Sat, 09 Dec 2023 08:33:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702139602; x=1702744402; darn=debbugs.gnu.org; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date:message-id:reply-to; bh=VCKR9wG89obpt0U/P6Xhzqz6usxa1cFPOIN492VK+9w=; b=nlGbdFOzMLsZXlPDlAajXYxw66+HI2r46Do/1DBgwefNUDMXlKoruPgcXQv9IPhvH5 Ps26Jl1LH/UD1UjWe4g9QbImelABwro/Sy9PHpIpK1RfrkqAaNSzdW0EuSfWrHaw3gcS bH3U/ikSSek6PV6qBs1J0KQypsFBIIeHDlDflcRGeeW7KtqvX5TNX5ltTAXV9R8RDerc 0T80c8AUD+LFYzGuRo0jkGpb1MtlLxM/xvKZk6AsCelbjB1rGL2XnPiTXE5x9Jtmqfms EcoN6ueA9gKtVnixGCqJ4A2PSSXgguS02jdirAUuUc0F3CyTllFpOdsF0w/q+7a3BRHt NcBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702139602; x=1702744402; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=VCKR9wG89obpt0U/P6Xhzqz6usxa1cFPOIN492VK+9w=; b=YEktZT2L1vvppq0zFLlWNejlcyuErjThUtdsNpZiD1EZYM7MQBpYfXaUt7WwlH56yo 1Z/Iieu77Mtq6WiXlYGbW5DtVEXIqcC8mkzmpwTS0Wygn7K0wr3XpX+UXzmHMpOM4ieL 6JgBa6uLf58aYdUWsgeXk9J5sgPQ06FEgrLDMh5k55ZhrJp1t2nRwsKgHBeC0FMbiMxO eZcxmsT/uRWTZcnGPnw1g8BhE5aJjfb0hQ1TAaSl29Eqfhddwdt7trUciv+SPWTFDv5P YmvL/7QYZNl0Q8H8KNqu+P773ZIkMuPbm3vwii+3jikyNoiNJc0HGvffdV3yQ8nEPTBX ruyg== X-Gm-Message-State: AOJu0YweLRkmNUdQi2ymZE/bnmv7i4aeD/NDADuUVQ5BlXpvSMs+F3Dw dCn3glZohSTKm2iha0ZdYNU= X-Google-Smtp-Source: AGHT+IFhgh0CWVFFs3im6lp1UQJxA+y2aF18tJvvZZ9yDuAUAczEiG21wjEHFIwRTldyOmgp8M9WxQ== X-Received: by 2002:a05:600c:4e0d:b0:40c:3f87:32df with SMTP id b13-20020a05600c4e0d00b0040c3f8732dfmr512597wmq.35.1702139602021; Sat, 09 Dec 2023 08:33:22 -0800 (PST) Received: from localhost ([188.120.129.233]) by smtp.gmail.com with ESMTPSA id gw18-20020a05600c851200b004053e9276easm9207831wmb.32.2023.12.09.08.33.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Dec 2023 08:33:21 -0800 (PST) Date: Sat, 9 Dec 2023 18:33:19 +0200 From: Efraim Flashner To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#67686] [PATCH core-updates 4/5] gnu: glibc: Install C.UTF-8 locale. Message-ID: Mail-Followup-To: Efraim Flashner , Ludovic =?utf-8?Q?Court=C3=A8s?= , 67686@debbugs.gnu.org References: <3e187cf8646059a513b502a17abe9f88daae6f6b.1701943221.git.ludo@gnu.org> <87v89ae24t.fsf@gnu.org> <87fs0dd7qr.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="zfAlKFmr3/Nwhl/X" Content-Disposition: inline In-Reply-To: <87fs0dd7qr.fsf@gnu.org> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 67686 Cc: 67686@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: -0.5 (/) --zfAlKFmr3/Nwhl/X Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Dec 07, 2023 at 10:26:36PM +0100, Ludovic Court=C3=A8s wrote: > Ludovic Court=C3=A8s skribis: >=20 > > Ludovic Court=C3=A8s skribis: > > > >> + ;; Install the C.UTF-8 locale so there's always = a UTF-8 > >> + ;; locale around. > >> + (let* ((out (assoc-ref outputs "out")) > >> + (bin (string-append out "/bin")) > >> + (locale (string-append out "/lib/locale/" > >> + ,(package-version > >> + this-package)))) > >> + (mkdir-p locale) > >> + (invoke (string-append bin "/localedef") > >> + "--no-archive" "--prefix" locale > >> + "-i" "C" "-f" "UTF-8" > >> + (string-append locale "/C.UTF-8"))))) > > > > I realize now that this cannot work when cross-compiling, because the > > this =E2=80=98localedef=E2=80=99 binary is not executable on the build = machine. > > > > I suspect libc builds an additional =E2=80=98localedef=E2=80=99 for the= build machine > > but I=E2=80=99m not sure where it is, hmm=E2=80=A6 >=20 > I was told on #glibc that (1) there=E2=80=99s no =E2=80=98localedef=E2=80= =99 for the build > machine produced during cross-compilation, and (2) that more generally, > there=E2=80=99s no way to cross-build locale data, that endianness and ot= her > things may matter. >=20 > I suspect #2 was about the locale archive and not locale data, because > evidence suggests that locale data is system-independent: >=20 > --8<---------------cut here---------------start------------->8--- > $ for s in aarch64-linux powerpc64le-linux armhf-linux i686-linux ; do di= ff -r $(guix build glibc-locales@2.35) $(guix build glibc-locales@2.35 -s "= $s") && echo "$s same as x86_64-linux" ; done > aarch64-linux same as x86_64-linux > powerpc64le-linux same as x86_64-linux > armhf-linux same as x86_64-linux > i686-linux same as x86_64-linux > $ guix describe > guix 6e2dd51 > repository URL: https://git.savannah.gnu.org/git/guix.git > branch: master > commit: 6e2dd51df5f3f51e9056dd4f2e1b036195ab3caa > --8<---------------cut here---------------end--------------->8--- >=20 > Efraim, could you check against powerpc-linux, which is the only > big-endian target we +/- support? I found a difference in almost every file. The tarball of the locales was too big to attach so I've uploaded it here=C2=B9. Looking at it in diffoscope it looked like most of the data that looked human readable was the same, but there was some endian switching with the other data bits. So without actually checking other big endian systems it looks like we could set target #f for the locales, but for those that share their endianness. =C2=B9 https://flashner.co.il/~efraim/glibc-locales-2.35-powerpc-linux.tar.= xz --=20 Efraim Flashner =D7=A8=D7=A0=D7=A9=D7=9C=D7=A4 = =D7=9D=D7=99=D7=A8=D7=A4=D7=90 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --zfAlKFmr3/Nwhl/X Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmV0ls0ACgkQQarn3Mo9 g1EgRw//ZeHYQ3kRKnihrjcE4UkEfg9XFqUgqIanQfkFCa7LXaGUJsWvpbdoZoOi EkyGyMo3wNstD7BTF44jjK0Ai02crHwSAev3ubOlCDAEHGSoJLMPhVsLhmISFcBY 64cRSFy0yXNREdS/4gJs0/+M5KE5My37psPumDILaBN11gwxPw37RhBFTjUXjY60 KMH0PkNI8CyFoEkVEtbUGeoC6qgLkH9OnzrjqwyT6pvIP1a5Y4LhJxQbXrEbIbbA kKYNdb3SygTKrirLaVay2XL+UQwx8KYnoxBy2O3/kQG+fMSHb8wvmaFLFUhtMOtP dUhmcz2AJD4ctbadYEz1qrVGDhfaTliQpThxccc0v+6LytrViza+qMhoD/mi+/sS pWmvhin/3jniOxXatnTPNvWL0RkFtmHXvVJxBs4IUqRlcuSpG1cMCcWSETp8iDSh eShNOaQ1Fj4uonrcSzUlOdbt51RE29FudKkehzWPFv/CD1sQopUJLHUynAyQW9Mc +wTH796PUEiXK9OT1BH9AmkPubW+2fM/FRd5afFjJ/b7JpNKow6rvZv132UYIw1R umIDml4sMg2EphNmcSNGFzbHTZJIYD0SGYT9TV/40s3yXkzU9VyBWoWlWUT1EPok K1I57QASGLaiqAD9nq7NsYV7X4XFd/QqghT4z5jkUsQ/nci3Ih0= =EKuL -----END PGP SIGNATURE----- --zfAlKFmr3/Nwhl/X-- From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 09 11:37:39 2023 Received: (at 67686-done) by debbugs.gnu.org; 9 Dec 2023 16:37:39 +0000 Received: from localhost ([127.0.0.1]:48808 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rC0Kg-0007kj-Tq for submit@debbugs.gnu.org; Sat, 09 Dec 2023 11:37:39 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:42222) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rC0Kf-0007kW-An for 67686-done@debbugs.gnu.org; Sat, 09 Dec 2023 11:37:38 -0500 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-40c38e292c8so5390635e9.0 for <67686-done@debbugs.gnu.org>; Sat, 09 Dec 2023 08:37:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702139838; x=1702744638; darn=debbugs.gnu.org; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date:message-id:reply-to; bh=iPmrSL5yPzezI/9AFsmyp2nz/h9geOnkOJSJULJYA6o=; b=f+He/urdwN0NIavkJXHfIspP6RPANB74T9OAo01RmsOD48s0+PldxH9KZ5R1o1uQ2Q JEI6Pj/gtCS2DOLBwf33+WJGmB46ZywyDefJryIVa/jsw1OUeF0sdISe3AduVa+izfcV lz9YsLIZ5idv5tTfdssEklYFMDB8rIvXr324Wg8sA730SCHpE2E914fDeDvd9dTKN9CY 8oNuzqqqDfDf1TdDjD+r9kSdH4/5Z9D7mtcdodfFDX0QBt2Inijm5SuQVF1WhsdjtGB2 jOeWMt4COJ8N6GrA6r2imskQ0mNNgV6o6eC4jaSCXu2Q0Na8G3US1gpQvQAJqFyGviRd 6j0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702139838; x=1702744638; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=iPmrSL5yPzezI/9AFsmyp2nz/h9geOnkOJSJULJYA6o=; b=SlIiJoZaRnKC8m14Td5oKeFgTupSQidJtPquOXIjAaQjLNmvIFTjFRXVeSzByFAxgN JAdq6UV9tjm9tqzBtPDkbRG5btKryUVnAefR7WWjxCAA6YDZTOS3SOdvvBl8A1g1qCG1 bGS+GOFa8mMqwOXX3acekgn8GvZgh/1L++Gw/exDRPtu5iMzERpCeS2FCh6EOUvxRdTS b96IVSaIyfMREmxWLSChWaDSMtKxWgasRnw8yg7LwQgBnGZpzKfhF08Efr71ylN20sCW b5DpSVEUJq75EbFDqqTj9LXbw5L+1g1Nobld2uqrHb+0yddsB83bJEyZvEypPDWtD17p 3Uig== X-Gm-Message-State: AOJu0YwGqlM+z92e2lFHXrwvnXewEQ0kLNl/DEOWMMfCZgNguwYrNCn1 WEBzSbOD863AltpqrLVyAXo= X-Google-Smtp-Source: AGHT+IERO+7slDcR5IufkS6/OtQGHFB5ZchtfwEo8LPYZ1HSyyj8jr0mE7ZQ6H0rU37lTZN+KKvDDw== X-Received: by 2002:a05:600c:438a:b0:40c:2a42:d7d4 with SMTP id e10-20020a05600c438a00b0040c2a42d7d4mr865417wmn.166.1702139837434; Sat, 09 Dec 2023 08:37:17 -0800 (PST) Received: from localhost ([188.120.129.233]) by smtp.gmail.com with ESMTPSA id w11-20020a05600c474b00b0040c251a1014sm2476813wmo.0.2023.12.09.08.37.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Dec 2023 08:37:17 -0800 (PST) Date: Sat, 9 Dec 2023 18:37:15 +0200 From: Efraim Flashner To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#67686] [PATCH core-updates v2 0/7] Update glibc to 2.38; make C.UTF-8 always available Message-ID: Mail-Followup-To: Efraim Flashner , Ludovic =?utf-8?Q?Court=C3=A8s?= , 67686-done@debbugs.gnu.org, Christopher Baines , Josselin Poiret , Mathieu Othacehe , Ricardo Wurmus , Tobias Geerinckx-Rice , Janneke Nieuwenhuizen References: <875y175son.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="rakkIitVNCbZpkVh" Content-Disposition: inline In-Reply-To: <875y175son.fsf@gnu.org> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 67686-done Cc: Josselin Poiret , Mathieu Othacehe , Tobias Geerinckx-Rice , Ricardo Wurmus , 67686-done@debbugs.gnu.org, Christopher Baines , Janneke Nieuwenhuizen 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: -0.5 (/) --rakkIitVNCbZpkVh Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Dec 09, 2023 at 03:58:16PM +0100, Ludovic Court=C3=A8s wrote: > Hello! >=20 > I=E2=80=99ve just pushed v2: >=20 > 5bbddafeaa gnu: glibc: Improve handling of empty .a files. > 1cebc334a7 gnu: glibc: Ensure C.UTF-8 locale is always found. > c76e44396e gnu: glibc: Install C.UTF-8 locale. > d5242a562e gnu: glibc: Update to 2.38. > cd43baad60 gnu: mpfr: Update to 4.2.1. > 3ea04038b5 gnu: glibc-utf8-locales: Generalize and use gexps. > 22f06be928 gnu: gcc@11: Update to 11.4.0. >=20 > I think it=E2=80=99s just the beginning of a journey :-) since we=E2=80= =99ll have to > test and fix cross-compilation, and eventually investigate the > (define glibc/hurd glibc) problems Janneke already reported. >=20 > By pushing my hope is to get support from the build farms so we can test > these higher-level issues without having to rebuild everything locally. With the v1 patchset I found that by reverting the file update and bringing it back to 5.44 I was able to build all the way to hello on x86_64-linux, i686-linux, aarch64-linux, riscv64-linux and powerpc64le-linux. I haven't tested armhf- or powerpc- yet. For cross-compiling I ran into a test failure in mpfr@4.2.0 and 4.2.1 as needed by gcc-cross-i686-linux-gnu-11.4.0. FAIL: tsprintf =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Error in mpfr_vsprintf (s, "%0+ -'13.10Pd:", ...); expected: "+01,234,567 :" got: "+0001,234,567:" FAIL tsprintf (exit status: 1) --=20 Efraim Flashner =D7=A8=D7=A0=D7=A9=D7=9C=D7=A4 = =D7=9D=D7=99=D7=A8=D7=A4=D7=90 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --rakkIitVNCbZpkVh Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmV0l7sACgkQQarn3Mo9 g1HsoA/+JRfXZKzdiXKQqrcWpiGA/hXi0cx1bd6cFMfNQutDT4oRvVqiTnwmGEtA h0DYNvwjG3i9s6XRLFC4GQBfGbPBRuBNqSyE8gWLB0QriAE3YN7IEDS2WduS35A7 /aJhw/XHYo76Dsk2obVfQo82Ssnm7sJjlgUD8T4bn88gCVzVEVqVx4KTDHLAApLe LPJ8wKhVxx2/k2MdCKsPaL90qxKdf9KoxiMv6bO2711gbmY5FdDN1ppT1G4c0KS4 JJ4gRLCXK0qjyGu4Z/VRZvATNjs7Xoz/n5cI87Q/he4v6HOhqQgkkq7VQvpIHxHB X9FfwqJOukOJ+/yKzszQzp/JhoHoum26GMW88SK/1HZIIP7v2q0lBzBMEDTCT1qk katsJn8p08FGfvaZCmjKBdOyOb6qFeRt5cCuC0KqW55YPsqG7/PAEDLcqJYN82/Y FYS7O1s0Y+55e3IiuiAZjRDz0TM6LdIscSm2TYYZE6zHm9QsCvzOAGTO5yWeBh8+ dLJRdnYtOmKUr8hPR2RrAaApxUnhYbj9NLxaqKseWLzGV498pXx0ffkuSs4AbY04 lgEmzbMJ3XL0gePSTMp7D8sml8blZe0aENSSJd3XDkda0r5XW24kuItbCRFalpUN 3Ud4QmxUpRYLNo8T4EmpKH8vRRY2M5SbHaja0zYAEknrAtj6i5Y= =hAW6 -----END PGP SIGNATURE----- --rakkIitVNCbZpkVh-- From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 09 16:42:06 2023 Received: (at 67686) by debbugs.gnu.org; 9 Dec 2023 21:42:06 +0000 Received: from localhost ([127.0.0.1]:49118 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rC55K-0007ie-4w for submit@debbugs.gnu.org; Sat, 09 Dec 2023 16:42:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60190) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rC55I-0007i8-UC for 67686@debbugs.gnu.org; Sat, 09 Dec 2023 16:42:05 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rC54z-0000MI-2B; Sat, 09 Dec 2023 16:41:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=hHq1X8GKes+7N79aT8m4Rjg72IUEDid503fdk6CKZ4A=; b=JCapzucA6qGRmEsIYmQt /Bng/Vd5e1e0k+dhJAJ2OUnbGrc7k0e4+RsjvpQOvd4xG+wkkrvoy8BH51TvKLF9baRALqp5SG7tL xDAQvIlTGaBn0tHABKbWc0/9D/oVz0UpV4mdavAsXjAnGwHDdn2UtX77b/RHDMFJ44m5Vlezf83G0 //DYR0xR5fzNUr93ZtI9OdoQ08vJw617qq14CgGlR3SWRlWI7B9SN0HHSFpPiH3BZTC/nVvI3qrLo D3RzVB7msTe8xuN4KgloeU6Kg/1ZiF5sV35jqVCEAa0lq2xaPjpz4S/TT9JAKiG/DAdlh+MNcDrdk KBogymJhbUwkOw==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Efraim Flashner Subject: Re: [bug#67686] [PATCH core-updates 4/5] gnu: glibc: Install C.UTF-8 locale. In-Reply-To: (Efraim Flashner's message of "Sat, 9 Dec 2023 18:33:19 +0200") References: <3e187cf8646059a513b502a17abe9f88daae6f6b.1701943221.git.ludo@gnu.org> <87v89ae24t.fsf@gnu.org> <87fs0dd7qr.fsf@gnu.org> Date: Sat, 09 Dec 2023 22:41:41 +0100 Message-ID: <87v8973vfu.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 67686 Cc: 67686@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 (---) Hello! Efraim Flashner skribis: > On Thu, Dec 07, 2023 at 10:26:36PM +0100, Ludovic Court=C3=A8s wrote: [...] >> I was told on #glibc that (1) there=E2=80=99s no =E2=80=98localedef=E2= =80=99 for the build >> machine produced during cross-compilation, and (2) that more generally, >> there=E2=80=99s no way to cross-build locale data, that endianness and o= ther >> things may matter. >>=20 >> I suspect #2 was about the locale archive and not locale data, because >> evidence suggests that locale data is system-independent: >>=20 >> --8<---------------cut here---------------start------------->8--- >> $ for s in aarch64-linux powerpc64le-linux armhf-linux i686-linux ; do d= iff -r $(guix build glibc-locales@2.35) $(guix build glibc-locales@2.35 -s = "$s") && echo "$s same as x86_64-linux" ; done >> aarch64-linux same as x86_64-linux >> powerpc64le-linux same as x86_64-linux >> armhf-linux same as x86_64-linux >> i686-linux same as x86_64-linux >> $ guix describe >> guix 6e2dd51 >> repository URL: https://git.savannah.gnu.org/git/guix.git >> branch: master >> commit: 6e2dd51df5f3f51e9056dd4f2e1b036195ab3caa >> --8<---------------cut here---------------end--------------->8--- >>=20 >> Efraim, could you check against powerpc-linux, which is the only >> big-endian target we +/- support? > > I found a difference in almost every file. The tarball of the locales > was too big to attach so I've uploaded it here=C2=B9. Looking at it in > diffoscope it looked like most of the data that looked human readable > was the same, but there was some endian switching with the other data > bits. So without actually checking other big endian systems it looks > like we could set target #f for the locales, but for those that share > their endianness. OK, interesting, thanks for checking! So we won=E2=80=99t be able to reliably provide C.UTF-8 in cross-compiled l= ibcs. Maybe not a big problem, but it does mean that cross-compiled code will be =E2=80=9Cless capable=E2=80=9D because of that. Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 09 16:45:02 2023 Received: (at 67686) by debbugs.gnu.org; 9 Dec 2023 21:45:02 +0000 Received: from localhost ([127.0.0.1]:49123 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rC589-0007nJ-Rm for submit@debbugs.gnu.org; Sat, 09 Dec 2023 16:45:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48968) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rC588-0007mk-1c for 67686@debbugs.gnu.org; Sat, 09 Dec 2023 16:45:00 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rC57o-0000zs-Vp for 67686@debbugs.gnu.org; Sat, 09 Dec 2023 16:44:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=w/z1puxRP1BLmMOF0QnnSMds/TDYxfF5rCX8oMYHJVE=; b=XjCZxiWCMfiArnOfU+af /nrxkSV0gH9qmrN/gP0gykgnXbgAfv9aVxPYqmfkd/RyVeopM2dQJhRayPFxbn09mybiGOvl2ov6A HTUGENyqNWx6nGv9RMZuQsxUpdb8gFIaaefDpxmAbyzS6G2VtWvzqfZJJJsUoY34XlqNEgGf7HCBt BKwwQVSpWmpnc6s4s1bvb5RtECusURXf+eZCI+PMOgGaWyAvcqASOp7LB8+1D0sfW5BPG8KBzCz7t Irp/kOGVyMImkvSmstfWu7PTA0MsKqUkv/97BmeO0jcuIbrEERal6IlER5VDWHGJVbcAv2ELU6IF1 usNYsbFoO/5Lwg==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: 67686@debbugs.gnu.org Subject: Re: [bug#67686] [PATCH core-updates v2 4/7] DRAFT gnu: glibc: Update to 2.38. In-Reply-To: <739f88b862b034289764f75e77fa6b438116d767.1701989279.git.ludo@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s=22's?= message of "Thu, 7 Dec 2023 23:54:07 +0100") References: <739f88b862b034289764f75e77fa6b438116d767.1701989279.git.ludo@gnu.org> Date: Sat, 09 Dec 2023 22:44:38 +0100 Message-ID: <87plzf3vax.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 67686 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 (---) Ludovic Court=C3=A8s skribis: > 2. Check cross-compilation. It=E2=80=99s looking surprisingly good! With commit 5cf6c96ad9ffafccf180ec2d44c740b6999c02ac, I could do: guix build hello --target=3Daarch64-linux-gnu =E2=80=A6 which resulted in a working AArch64 binary. Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 09 19:57:46 2023 Received: (at 67686) by debbugs.gnu.org; 10 Dec 2023 00:57:46 +0000 Received: from localhost ([127.0.0.1]:49204 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rC88c-0004ng-Up for submit@debbugs.gnu.org; Sat, 09 Dec 2023 19:57:46 -0500 Received: from wolfsden.cz ([37.205.8.62]:40512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rC88Z-0004nS-L3; Sat, 09 Dec 2023 19:57:41 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id C415925D198; Sun, 10 Dec 2023 00:57:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1702169844; bh=uhXOZMbTxYg5//BkpoCdihdD5J+CVJ4SkOhO13vul7g=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=V6LSCCoc066exYViH+8Y9wP2EZ5CombRyNrlSV8qpbFe30p1Z9oA0M5vkgCZQpyRW 4QlG1+Yy4LHmbCJu8WfpsrWeZbAIiopgMBjn1kgM72k8k2XsA/r/6elVlwLcts/vPM W3c4Q2qKjOzfT0qTkFSYQrAz2eZ7LRS26r6irDdb6PIReNBOtKTAByd9zKOUmgpkX1 u7csZPd3cVqLJgRxil4g4n9ztaTSa9m1fb/qF8Grwv2hybKPjtSMTK2QzxVcZ0KmOP Qp8rTSP1ctvlpCTh+YZFlkEQGPka0EDAuUXYXvqEJbu0yZiHV1olMnIMhRFuRBD8gE L6V/o/TH5x1dsZfyTIMQy9famKXz8U9VFIPJ25ItrY0Wj/ilU68dI1zVPlJobpG4ys tRfYjFRgvvywZQUJL2CJOLd3miH0OPczaXzIu/AW6snzdiMQ7BaspfMmapRM551GyL 94/tKgBxAwMFW9yLfZ1sBOARZErvq7XgTy1c3sh3zM7qcl0EDH8GpqivTVmhxH0n6h ED64Plz2rH7R6EbUZNiRlx4RhcTalADsd2BA/a58LrjaEzIC+3S3pnypj5CoPUHm3Q H2MWpqL9iBHyjPP6arGXeXVDZoRAXPg/Glfs8ZtJcrZWwMpOCJ/GfoJf6xFvE086wB LCxJlaUKYQH55C/m3aV8BKV8= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from localhost (unknown [193.32.127.172]) by wolfsden.cz (Postfix) with ESMTPSA id 1D26225D5A5; Sun, 10 Dec 2023 00:57:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1702169843; bh=uhXOZMbTxYg5//BkpoCdihdD5J+CVJ4SkOhO13vul7g=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=K8AGHh3vx2U1nBKBYLUcT1lxvUgMVWecM1DJP1qM7NVE+wJlKBI12mziRZA7cq1FI POuRhtlIfI0oQFjY16cvR6tpC9Qm9yON+apQLCF94Qv1CSGdJNUY9tdA1FIIL75pO2 8rSNJa5jZZ3Br/aREtvq4Hlfs1GrHV/T72SS05pHmaqL+kA/LlCoaetlyKoiantIix jF4itxKhzkvHOOFT921VMaOlO7BSOkAskSuKFehXDCBuv2ZEb4AmvUUb3LnDuasrHL CdFHg748FjgjS47nBWHxDPfDiavC001y5IUoMkrqdYyh7xHcirNo1o1npk1mP2Mqv5 xAhaWXQiN7GMDI3byQ1P3h6Fo47S9Sv/1MI7Fu2rNfxHoO3H9dD5/SHxr9R2UB4SuO eE5CO5myez1aUoJ5rrOfN0whUvC6c8diQW/CV5pF7DcmVceFl9P9nz7xslK5kMO/bS C9HBqyoW66pEMgxDS68O8bGSZ7/SRha/KlA/l7DrfP/8Lq1lPSVXZ4sbZfzr9DAvHt 7xxZp79nRKKQSO3OCOS0PXlbCRhxsvoARV4pK1n1hQvRAMsJdb/bOsh/wUpa81APfV jBWX68mYwKgz/8CC6J1Sf8MY0PijjtuS3/jgvGUGLJrjyjQpDKbzIZdBIJo6Mi+6HN 1bd12NnW12CHyA9lCUE8LYg8= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id f53f9853; Sun, 10 Dec 2023 00:57:22 +0000 (UTC) Date: Sun, 10 Dec 2023 01:57:22 +0100 From: Tomas Volf <~@wolfsden.cz> To: Ludovic =?iso-8859-1?Q?Court=E8s?= Subject: Re: [bug#67686] bug#67044: C.utf8 locale cannot be built Message-ID: References: <87bkbex3bh.fsf@gnu.org> <87zfyme29z.fsf@gnu.org> <87a5qj5t7h.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="/tonNw6D8m+pLgx5" Content-Disposition: inline In-Reply-To: <87a5qj5t7h.fsf@gnu.org> X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 67686 Cc: 67044@debbugs.gnu.org, 67686@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: -0.8 (/) --/tonNw6D8m+pLgx5 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 2023-12-09 15:46:58 +0100, Ludovic Court=C3=A8s wrote: > > I still believe it makes sense to add the -c also into the locale build= er, > > because my understanding is that this change will not allow using (loca= le > > "C.utf8") in the operating-system definition (since that would still tr= y to > > build it, and fail). > > > > If you are not opposed to the idea, I can send a patch if you would pre= fer not > > to do it yourself. > > No you=E2=80=99re right, we could add =E2=80=98-c=E2=80=99 to the code in= (gnu system locale), > though perhaps it would be safer to do so only in the 2.35 + C.UTF-8 > case. > > (We can do that independently of this patch.) My attempt at that can be found here: https://issues.guix.gnu.org/67735 Tomas -- There are only two hard things in Computer Science: cache invalidation, naming things and off-by-one errors. --/tonNw6D8m+pLgx5 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEt4NJs4wUfTYpiGikL7/ufbZ/wakFAmV1DPIACgkQL7/ufbZ/ wakzhw//cJZHhz2Np/v2qjk6+hNBO5aAeCcA1NcVmfO/CPoLsIu2I/uOkYJi3ClS b5cJLwhpQ3PV2Dyffi2eteBrs0clBeTy04Q8BPAY1H69bG2pWPAHvgT6roA0gBdl I37CKs6Mg9LYgxgiYpOqfkV4qoPP6GxZyjs5jXlA4Uw/esWS33oL1NRacsZ+Ffin Gx3uh9uZdAlZLc2G4vAIPGyoTw9rijILC9h59cJ71xASKvj9XYD2aUm6gkFI900v w9TMA/kYO3PR86mheX4Vkvs8kmqSyR6PiGzDjkN1lH3tG5n21TaEiuR873y2te7d ZHU5r7XmT/XuqZ818jhA1xQYt5D7PkRVeGPanjmlK1Dc4j77+jeYUDWBaW+tWKC8 zzmGCNztop0fEHr2jAmi4Vu/dk72fFy4gLmmHcPdVRYLIDwOSF/bEf0VQRXg0Mwy BnY0tp1GBZBvL74JLq5ygzRl/73k6vD4SHy16KrdWJDnJIB1jrNIUJBYGvLbBthC L/sRfkhPdizd5bxKJCpfRobloJXhzU7NkXExt9bOFhKlC8auOOY4g4snJZDTU+1k Y7lRH/Oz/60a4UiBsQYsbk1MYhwJ61Rh7K9kjs9HtIzrfJYFgX7j1qSnQow0l2g8 OYhPCHIcTbrqSDyt8pCfze0rqeAJkx8Up9jDK04/bB9Gd1N3maA= =1sE0 -----END PGP SIGNATURE----- --/tonNw6D8m+pLgx5-- From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 10 02:24:29 2023 Received: (at 67686) by debbugs.gnu.org; 10 Dec 2023 07:24:29 +0000 Received: from localhost ([127.0.0.1]:49391 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rCEAu-00012q-QU for submit@debbugs.gnu.org; Sun, 10 Dec 2023 02:24:29 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:42022) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rCEAq-00012X-G9 for 67686@debbugs.gnu.org; Sun, 10 Dec 2023 02:24:26 -0500 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-40c38e292c8so6963855e9.0 for <67686@debbugs.gnu.org>; Sat, 09 Dec 2023 23:24:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702193044; x=1702797844; darn=debbugs.gnu.org; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date:message-id:reply-to; bh=r32FZZdI5xUcOA9jIICrvAK7iSWm2k3oSy1EbzhyyQk=; b=Tj1ZBeUXEKsFn0SiQkMrJYF8wo6P9qbhQFWBIrhH7y9pRYJwXazMaIkxORB2Bwsit7 Men+5ygo3Sxk4OUyKkeHFdaH3hm0U2jUyFNGKmmt/VPezdd3k4TcT3w4vO8FXFI4zmbA 7o0WEYqJW49klCD7Nyf54cX2t0a5VZ6ltP7grf7OmR9AlC9APN/8UxnZQqCciLlCj0K2 MIncfbniNDeUPoQDvvEeoQDgBDQob4tHDkQJVEMOf9gE3bGMoz2Lvp8fkVh4O2M0rGfX bW0cmS1+MvipuNGUrerQM2KBMglk3k0YE/v1W2sLC/NzsUBYAjOkGf6SACCpqVJIEWDr jokA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702193044; x=1702797844; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=r32FZZdI5xUcOA9jIICrvAK7iSWm2k3oSy1EbzhyyQk=; b=CVSD0aQRw6oRGJviZOEyLOLN28hGHrEeZDKVIPCQWczQO7WDpS3H76Y2wjB+259vPV WYv9DjjM1GO9If1W1IfyJ7zchw2+dOpBKy5CtM3zvuwzqvlWKp38OQySZrS6XmYDi0xS fV7KswogM+OChGwncIy2gx1FggyIRUrJCpg5qGEQ6eZonYdaytnJZMdJ4dIYBIUeaUZs eYCh1ffYGcMlQlHjG1Wl1h41KT80wDBxvyzrveDJFiDVvryMUGkBhomOgQKSUm5ueISE 7bPIazXyO22MxljllPIv5FRlLDViVWwXiuiBCBaHBdl5Ow9tmbwCvvGuOagI0D4Orlad wZgg== X-Gm-Message-State: AOJu0YzLq+QogFzfctWbCEKAa8J5u+0Nw3AH5P5UBmLNumh9HnDd/Ddv ODboue+m6bENAm6RvFxq/x8vfc6uyvoxKg== X-Google-Smtp-Source: AGHT+IGG2ckTAmIfVW8IkfFF8BqV/rbtPdik9I5O5w8rbrp2SpNdl++NDVrHkkLsDjsu/jfZP2DWBw== X-Received: by 2002:a05:600c:1ca9:b0:40b:5e26:236e with SMTP id k41-20020a05600c1ca900b0040b5e26236emr1368218wms.31.1702193044362; Sat, 09 Dec 2023 23:24:04 -0800 (PST) Received: from localhost ([188.120.129.233]) by smtp.gmail.com with ESMTPSA id h14-20020a5d548e000000b003333fbb68c7sm5704940wrv.112.2023.12.09.23.24.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Dec 2023 23:24:03 -0800 (PST) Date: Sun, 10 Dec 2023 09:24:01 +0200 From: Efraim Flashner To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#67686] [PATCH core-updates 4/5] gnu: glibc: Install C.UTF-8 locale. Message-ID: Mail-Followup-To: Efraim Flashner , Ludovic =?utf-8?Q?Court=C3=A8s?= , 67686@debbugs.gnu.org References: <3e187cf8646059a513b502a17abe9f88daae6f6b.1701943221.git.ludo@gnu.org> <87v89ae24t.fsf@gnu.org> <87fs0dd7qr.fsf@gnu.org> <87v8973vfu.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="mZgCcSvEs3UffgN6" Content-Disposition: inline In-Reply-To: <87v8973vfu.fsf@gnu.org> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 67686 Cc: 67686@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: -0.5 (/) --mZgCcSvEs3UffgN6 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Dec 09, 2023 at 10:41:41PM +0100, Ludovic Court=C3=A8s wrote: > Hello! >=20 > Efraim Flashner skribis: >=20 > > On Thu, Dec 07, 2023 at 10:26:36PM +0100, Ludovic Court=C3=A8s wrote: >=20 > [...] >=20 > >> I was told on #glibc that (1) there=E2=80=99s no =E2=80=98localedef=E2= =80=99 for the build > >> machine produced during cross-compilation, and (2) that more generally, > >> there=E2=80=99s no way to cross-build locale data, that endianness and= other > >> things may matter. > >>=20 > >> I suspect #2 was about the locale archive and not locale data, because > >> evidence suggests that locale data is system-independent: > >>=20 > >> --8<---------------cut here---------------start------------->8--- > >> $ for s in aarch64-linux powerpc64le-linux armhf-linux i686-linux ; do= diff -r $(guix build glibc-locales@2.35) $(guix build glibc-locales@2.35 -= s "$s") && echo "$s same as x86_64-linux" ; done > >> aarch64-linux same as x86_64-linux > >> powerpc64le-linux same as x86_64-linux > >> armhf-linux same as x86_64-linux > >> i686-linux same as x86_64-linux > >> $ guix describe > >> guix 6e2dd51 > >> repository URL: https://git.savannah.gnu.org/git/guix.git > >> branch: master > >> commit: 6e2dd51df5f3f51e9056dd4f2e1b036195ab3caa > >> --8<---------------cut here---------------end--------------->8--- > >>=20 > >> Efraim, could you check against powerpc-linux, which is the only > >> big-endian target we +/- support? > > > > I found a difference in almost every file. The tarball of the locales > > was too big to attach so I've uploaded it here=C2=B9. Looking at it in > > diffoscope it looked like most of the data that looked human readable > > was the same, but there was some endian switching with the other data > > bits. So without actually checking other big endian systems it looks > > like we could set target #f for the locales, but for those that share > > their endianness. >=20 > OK, interesting, thanks for checking! >=20 > So we won=E2=80=99t be able to reliably provide C.UTF-8 in cross-compiled= libcs. > Maybe not a big problem, but it does mean that cross-compiled code will > be =E2=80=9Cless capable=E2=80=9D because of that. We should be able to create some monstrosity of a #:target field to say that within an endianness group target is #f but otherwise is (%current-target-system). Should work for all the locale generators actually. untested: (if (and (target-little-endian? (%current-system)) (target-little-endian? (%current-target-system))) #f (%current-target-system)) Although if we are going to rely on target-little-endian we might want to define that field in (guix platform) too so we don't assign an endianness to 8-bit controllers or embedded systems. --=20 Efraim Flashner =D7=A8=D7=A0=D7=A9=D7=9C=D7=A4 = =D7=9D=D7=99=D7=A8=D7=A4=D7=90 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --mZgCcSvEs3UffgN6 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmV1Z44ACgkQQarn3Mo9 g1Ev3g/+Myw2kbuk2L6bmmXiwCdrKBmnVrUfqptfFVO2tjCLWDZVy4Oatf5mFyID nhiMm5zBSKGVpCtQ2MWgSn8gNsOj9V/z0ITOoaoyzNQfPdG7tCPycYQwd43a/uOg 2SUKxKx4K+L1+apfKFU1v3jZAa/BXukmjQFCzBbe6RsOjsEX7KUKeU+fjQWjkmDO n3s9gWtmuntMdvBaoGd02HZV70j85q0KJKEpC+Ac1CDiGWlBYx+LTs9a3BxlIB0d VF9F8M7JMzVhkE4VuI9PCLcXgTo2IXRxakqhpDA4eD1IIjN8Shy2Yx3Uy3A8tAkq pQVBmlE4L+PrvEVmsPYRpt2iYKrx7yg7Sux1I/Hqw7HBzVYyuN6mPAq8XFMfneVE 44BC3GL9zcG1DIxBarcrrxnbaXQXhoaayA8yZol6fOPFd7V+zw51zyO6h1yHfjck VSPjq2DSs42+tKWdfnHK6XOFZDmRU8ZDTm218fTT+yfm3XRSahE7+5ql6d4UBeJ9 WWhljWRtVPZZg+/3rM0O/7PM0svKyoEdhNNoXZ4luhgpISe7V0itw/PdqvkDHtX3 QLSi1l5vcMxXkbU9xvkF8+a0A+xXjRNUVbV1Wf/YUZd1qKomQm4TPi67sIVg56EA fC7BTLZ0CCM4Wc26FXak+KgRRgU3Lfg2avWtWuQcn8Ujslwwz/g= =e6cb -----END PGP SIGNATURE----- --mZgCcSvEs3UffgN6-- From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 10 05:14:45 2023 Received: (at 67686) by debbugs.gnu.org; 10 Dec 2023 10:14:45 +0000 Received: from localhost ([127.0.0.1]:49533 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rCGpg-0006DC-M1 for submit@debbugs.gnu.org; Sun, 10 Dec 2023 05:14:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41540) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rCGpb-0006Cw-Ki for 67686@debbugs.gnu.org; Sun, 10 Dec 2023 05:14:43 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rCGpC-0000R2-JT; Sun, 10 Dec 2023 05:14:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=GLofncmtV/3WgLKtz4bjcd4YlTuRk1pcjhf0qS6v/kA=; b=JRS7BBOnytcwzSGeBdbT k6c9/p1Hh3B4GzYHGw7hM4wNS59qU8CQGjZl4vySbPQrogIRqhDyBLhVCM73eZE/zRWYhAGt+Pu+/ oGT8LSDwTFbefO5Zx3lgxL1O8eX3JpCRlN/rsp9QlJfGMfm/UGQUs/0zSo7fLh850nvXtDjk9luNk vUV2zok3p+e6AHPKGCCJbauDQ0zZz7r9D5JOpcqoPtAL36XCAqvJRg76PV+BfPLYd8wZyonvkkVVe q6/BFngE887ALm96qxeXcTd+OjiVu5hBirQiDDQkYsEJOax1LKqV7HUAng8BnP1QmP1x1pUdwa1aR 2KNpXxdioCbRSw==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: 67686@debbugs.gnu.org Subject: Re: [bug#67686] [PATCH core-updates v2 4/7] DRAFT gnu: glibc: Update to 2.38. In-Reply-To: <87plzf3vax.fsf@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?= =?utf-8?Q?s?= message of "Sat, 09 Dec 2023 22:44:38 +0100") References: <739f88b862b034289764f75e77fa6b438116d767.1701989279.git.ludo@gnu.org> <87plzf3vax.fsf@gnu.org> Date: Sun, 10 Dec 2023 11:14:11 +0100 Message-ID: <87jzpm4b64.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 67686 Cc: Janneke Nieuwenhuizen 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 (---) Ludovic Court=C3=A8s skribis: > Ludovic Court=C3=A8s skribis: > >> 2. Check cross-compilation. > > It=E2=80=99s looking surprisingly good! With commit > 5cf6c96ad9ffafccf180ec2d44c740b6999c02ac, I could do: > > guix build hello --target=3Daarch64-linux-gnu > > =E2=80=A6 which resulted in a working AArch64 binary. I spoke a bit too fast: the =E2=80=98qemu-binfmt=E2=80=99 service was runni= ng on the machine so I didn=E2=80=99t spot a problem that commit e4013b31266b40dc9cb250c44b2088d3931cb3b3 fixes. Anyway, from that commit I could cross-build for aarch64-linux-gnu and i586-gnu (still using glibc 2.37) and both work fine. Ludo=E2=80=99. From unknown Sun Jun 22 22:45:25 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 07 Jan 2024 12:24:09 +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