From patchwork Thu Dec 7 22:54:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 57369 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 85C4227BBEA; Thu, 7 Dec 2023 22:56:36 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F0D0527BBE2 for ; Thu, 7 Dec 2023 22:56:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBNHh-0000Vu-6H; Thu, 07 Dec 2023 17:55:57 -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 1rBNHc-0000QB-Mg for guix-patches@gnu.org; Thu, 07 Dec 2023 17:55:54 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rBNHa-0002fO-Eh for guix-patches@gnu.org; Thu, 07 Dec 2023 17:55:52 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rBNHm-0006sv-WC for guix-patches@gnu.org; Thu, 07 Dec 2023 17:56:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67686] [PATCH core-updates v2 1/7] gnu: gcc@11: Update to 11.4.0. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Dec 2023 22:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67686 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67686@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Greg Hogan , Janneke Nieuwenhuizen Received: via spool by 67686-submit@debbugs.gnu.org id=B67686.170198971426312 (code B ref 67686); Thu, 07 Dec 2023 22:56:02 +0000 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: Ludovic =?utf-8?q?Court=C3=A8s?= 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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 From patchwork Thu Dec 7 22:54:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 57365 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2417927BBE9; Thu, 7 Dec 2023 22:56:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C60F927BBE2 for ; Thu, 7 Dec 2023 22:56:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBNHg-0000UT-JY; Thu, 07 Dec 2023 17:55:56 -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 1rBNHa-0000MP-Lj for guix-patches@gnu.org; Thu, 07 Dec 2023 17:55:52 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rBNHZ-0002fL-RV for guix-patches@gnu.org; Thu, 07 Dec 2023 17:55:50 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rBNHm-0006sg-3H for guix-patches@gnu.org; Thu, 07 Dec 2023 17:56:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67686] [PATCH core-updates v2 2/7] gnu: glibc-utf8-locales: Generalize and use gexps. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Dec 2023 22:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67686 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67686@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 67686-submit@debbugs.gnu.org id=B67686.170198971126281 (code B ref 67686); Thu, 07 Dec 2023 22:56:02 +0000 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: Ludovic =?utf-8?q?Court=C3=A8s?= 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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"))) From patchwork Thu Dec 7 22:54:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 57364 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DA9FC27BBE9; Thu, 7 Dec 2023 22:56:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EED8D27BBE2 for ; Thu, 7 Dec 2023 22:56:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBNHk-0000aQ-KC; Thu, 07 Dec 2023 17:56:00 -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 1rBNHc-0000QG-Pg for guix-patches@gnu.org; Thu, 07 Dec 2023 17:55:54 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rBNHa-0002fU-Ta for guix-patches@gnu.org; Thu, 07 Dec 2023 17:55:52 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rBNHn-0006t2-FN for guix-patches@gnu.org; Thu, 07 Dec 2023 17:56:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67686] [PATCH core-updates v2 3/7] gnu: mpfr: Update to 4.2.1. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Dec 2023 22:56:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67686 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67686@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Janneke Nieuwenhuizen Received: via spool by 67686-submit@debbugs.gnu.org id=B67686.170198971426320 (code B ref 67686); Thu, 07 Dec 2023 22:56:03 +0000 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: Ludovic =?utf-8?q?Court=C3=A8s?= 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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?) From patchwork Thu Dec 7 22:54:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 57367 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B4D6C27BBE9; Thu, 7 Dec 2023 22:56:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C273927BBE2 for ; Thu, 7 Dec 2023 22:56:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBNHi-0000ZC-QR; Thu, 07 Dec 2023 17:55:58 -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 1rBNHc-0000QE-PF for guix-patches@gnu.org; Thu, 07 Dec 2023 17:55:54 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rBNHb-0002fV-Bd for guix-patches@gnu.org; Thu, 07 Dec 2023 17:55:52 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rBNHn-0006tB-Tl for guix-patches@gnu.org; Thu, 07 Dec 2023 17:56:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67686] [PATCH core-updates v2 4/7] DRAFT gnu: glibc: Update to 2.38. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Dec 2023 22:56:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67686 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67686@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 67686-submit@debbugs.gnu.org id=B67686.170198971526327 (code B ref 67686); Thu, 07 Dec 2023 22:56:03 +0000 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: Ludovic =?utf-8?q?Court=C3=A8s?= 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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"_ From patchwork Thu Dec 7 22:54:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 57366 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 66CA227BBE9; Thu, 7 Dec 2023 22:56:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 54E4A27BBEA for ; Thu, 7 Dec 2023 22:56:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBNHh-0000Wu-G8; Thu, 07 Dec 2023 17:55:57 -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 1rBNHc-0000QF-P7 for guix-patches@gnu.org; Thu, 07 Dec 2023 17:55:54 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rBNHb-0002fj-PX for guix-patches@gnu.org; Thu, 07 Dec 2023 17:55:52 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rBNHo-0006tJ-BC for guix-patches@gnu.org; Thu, 07 Dec 2023 17:56:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67686] [PATCH core-updates v2 5/7] gnu: glibc: Install C.UTF-8 locale. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Dec 2023 22:56:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67686 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67686@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 67686-submit@debbugs.gnu.org id=B67686.170198971526335 (code B ref 67686); Thu, 07 Dec 2023 22:56:04 +0000 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: Ludovic =?utf-8?q?Court=C3=A8s?= 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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)) From patchwork Thu Dec 7 22:54:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 57370 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 47B4C27BBEB; Thu, 7 Dec 2023 22:56:37 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F0B0327BBE2 for ; Thu, 7 Dec 2023 22:56:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBNHh-0000Xg-Of; Thu, 07 Dec 2023 17:55:57 -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 1rBNHc-0000QD-OM for guix-patches@gnu.org; Thu, 07 Dec 2023 17:55:54 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rBNHc-0002fk-AS for guix-patches@gnu.org; Thu, 07 Dec 2023 17:55:52 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rBNHo-0006tQ-Rq for guix-patches@gnu.org; Thu, 07 Dec 2023 17:56:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67686] [PATCH core-updates v2 6/7] gnu: glibc: Ensure C.UTF-8 locale is always found. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Dec 2023 22:56:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67686 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67686@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 67686-submit@debbugs.gnu.org id=B67686.170198971626342 (code B ref 67686); Thu, 07 Dec 2023 22:56:04 +0000 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: Ludovic =?utf-8?q?Court=C3=A8s?= 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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: From patchwork Thu Dec 7 22:54:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 57368 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5DF0A27BBEC; Thu, 7 Dec 2023 22:56:33 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 04BC627BBE2 for ; Thu, 7 Dec 2023 22:56:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBNHj-0000Zh-3J; Thu, 07 Dec 2023 17:55:59 -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 1rBNHe-0000Rn-G1 for guix-patches@gnu.org; Thu, 07 Dec 2023 17:55:54 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rBNHc-0002gt-Oq for guix-patches@gnu.org; Thu, 07 Dec 2023 17:55:53 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rBNHp-0006tZ-AU for guix-patches@gnu.org; Thu, 07 Dec 2023 17:56:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67686] [PATCH core-updates v2 7/7] gnu: glibc: Improve handling of empty .a files. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Dec 2023 22:56:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67686 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67686@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 67686-submit@debbugs.gnu.org id=B67686.170198971626349 (code B ref 67686); Thu, 07 Dec 2023 22:56:05 +0000 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: Ludovic =?utf-8?q?Court=C3=A8s?= 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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)