From patchwork Mon Dec 18 16:30:12 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: 57677 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 F137D27BBE9; Mon, 18 Dec 2023 16:31:38 +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 89CDF27BBE2 for ; Mon, 18 Dec 2023 16:31:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rFGWI-0001Ws-85; Mon, 18 Dec 2023 11:31:06 -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 1rFGWG-0001WC-Mb for guix-patches@gnu.org; Mon, 18 Dec 2023 11:31:04 -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 1rFGWG-0007Wj-Dt; Mon, 18 Dec 2023 11:31:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rFGWE-0006hh-OE; Mon, 18 Dec 2023 11:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67824] [PATCH core-updates v2 1/9] packages: Remove reference to =?utf-8?b?4oCYZ2xpYmMtdXRmOC1sb2NhbGVz4oCZ?= in =?utf-8?b?4oCYcGF0Y2gtYW5k?= =?utf-8?b?LXJlcGFja+KAmS4=?= Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Mon, 18 Dec 2023 16:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67824 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67824@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 67824-submit@debbugs.gnu.org id=B67824.170291705325056 (code B ref 67824); Mon, 18 Dec 2023 16:31:02 +0000 Received: (at 67824) by debbugs.gnu.org; 18 Dec 2023 16:30:53 +0000 Received: from localhost ([127.0.0.1]:33346 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFGW4-0006VE-Hu for submit@debbugs.gnu.org; Mon, 18 Dec 2023 11:30:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44468) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFGW2-0006Gu-Cm for 67824@debbugs.gnu.org; Mon, 18 Dec 2023 11:30:51 -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 1rFGVu-0007Pn-C4; Mon, 18 Dec 2023 11:30:42 -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=esGTSCCwbyWAuZisK1NnkyH8jwizKtf2uxVtQOahA4M=; b=qoWWFG5E5oRAOKaN59EH XKCV71eKNJhcjLUMyxkMW/VrYKrnzm2PAIsMbIW22JQso4SlEu2vfZMyz7f3LnJ3pqOKfKb4guBY3 Vb5rWN7WZ2fW9qIkoQv1t7tEjzFVnpoCeuv1BrGecHBYgeagwxrizfgvtECid53hn9NdL5YRXncKt M2i0sZ/rFRIL/y7sMal3b3c4I3x/dCCjk3PHIjjCdbihmHqXtTPEzdoPKq2GKqLQbikza0HnrF1Yd 8250YWg/RFk94H5IpY9aIJZeNqQj52Bf721KAdkT4WHD0nhtXozWpXn6UHzQGff5T35qLG6VR5U+i dHk7xyDQvHZaCA==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 18 Dec 2023 17:30:12 +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 This is a followup to 1cebc334a77030c0c94955981652f4df7608c9e3. * guix/packages.scm (%standard-patch-inputs): Remove “locales” entry. (patch-and-repack): Remove ‘locales’ variable. [build]: Remove reference to ‘locales’. Use “C.UTF-8” unconditionally. Change-Id: I54219b232880e05534599fbba8738cc00fb5d568 --- guix/packages.scm | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/guix/packages.scm b/guix/packages.scm index 930b1a3b0e..4b0c478ff4 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -866,13 +866,7 @@ (define (%standard-patch-inputs system) ("gzip" ,(ref '(gnu packages compression) 'gzip)) ("lzip" ,(ref '(gnu packages compression) 'lzip)) ("unzip" ,(ref '(gnu packages compression) 'unzip)) - ("patch" ,(ref '(gnu packages base) 'patch)) - ("locales" - ,(parameterize ((%current-target-system #f) - (%current-system system)) - (canonical - ((module-ref (resolve-interface '(gnu packages base)) - 'libc-utf8-locales-for-target)))))))) + ("patch" ,(ref '(gnu packages base) 'patch))))) (define (default-guile) "Return the default Guile package used to run the build code of @@ -955,7 +949,6 @@ (define* (patch-and-repack source patches (lzip (lookup-input "lzip")) (xz (lookup-input "xz")) (patch (lookup-input "patch")) - (locales (lookup-input "locales")) (comp (and=> (compressor source-file-name) lookup-input)) (patches (map instantiate-patch patches))) (define build @@ -1017,15 +1010,17 @@ (define* (patch-and-repack source patches ;; Encoding/decoding errors shouldn't be silent. (fluid-set! %default-port-conversion-strategy 'error) - (when #+locales - ;; First of all, install a UTF-8 locale so that UTF-8 file names - ;; are correctly interpreted. During bootstrap, LOCALES is #f. - (setenv "LOCPATH" - (string-append #+locales "/lib/locale/" - #+(and locales - (version-major+minor - (package-version locales))))) - (setlocale LC_ALL "en_US.utf8")) + ;; First of all, install a UTF-8 locale so that UTF-8 file names + ;; are correctly interpreted. During bootstrap, locales are + ;; missing. + (let ((locale "C.UTF-8")) + (catch 'system-error + (lambda () + (setlocale LC_ALL locale)) + (lambda args + (format (current-error-port) + "failed to install '~a' locale: ~a~%" + locale (system-error-errno args))))) (setenv "PATH" (string-append #+xz "/bin" From patchwork Mon Dec 18 16:30:13 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: 57676 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 E648627BBE9; Mon, 18 Dec 2023 16:31:26 +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 BC7AD27BBEB for ; Mon, 18 Dec 2023 16:31:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rFGWG-0001WH-WE; Mon, 18 Dec 2023 11:31:05 -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 1rFGWE-0001Vj-Hg for guix-patches@gnu.org; Mon, 18 Dec 2023 11:31:02 -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 1rFGWE-0007WD-8a for guix-patches@gnu.org; Mon, 18 Dec 2023 11:31:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rFGWF-0006jK-O1; Mon, 18 Dec 2023 11:31:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67824] [PATCH core-updates v2 2/9] build-system/gnu: Change default locale to C.UTF-8. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: leo@famulari.name, me@tobias.gr, guix-patches@gnu.org Resent-Date: Mon, 18 Dec 2023 16:31:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67824 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67824@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Leo Famulari , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Leo Famulari , Tobias Geerinckx-Rice Received: via spool by 67824-submit@debbugs.gnu.org id=B67824.170291705425150 (code B ref 67824); Mon, 18 Dec 2023 16:31:03 +0000 Received: (at 67824) by debbugs.gnu.org; 18 Dec 2023 16:30:54 +0000 Received: from localhost ([127.0.0.1]:33352 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFGW6-0006Wy-6z for submit@debbugs.gnu.org; Mon, 18 Dec 2023 11:30:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44496) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFGW3-0006IG-3g for 67824@debbugs.gnu.org; Mon, 18 Dec 2023 11:30:52 -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 1rFGVv-0007RL-QK; Mon, 18 Dec 2023 11:30:43 -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=et/sECpzylS1JuG0KCO2HY6TF+xrYhHhF6XJVAmbFdE=; b=Cas19niNXpV/8dTjlO82 0zo45oa1iEK5LT0i4wm0wDt7YDIZLWXQp2oGgWfe2jyvaIlV83FTzOS6GpQF+L2Hzha1CcnA/ba2H Dn/1DQr9lWpN9eMw3AZjMskGeDU0KvxjrjIcKmhfHe9uFt+K8+nXTE6D81DN7dCEFbkWD+pVIZ/oF V6n1Gnv8ryHAxRoM2VTkDRnZtrPUp33CfJ/+SprJeJqRjD73KAwEXsOIsUc6Hc47IzvHu2M5CXmSp iiWMdEDsCVl/Gv05NOy1ItWAshpLUbR6olbQ+5xK36AiKXgKbevBXQ65LlMyQleH6+bh3zs97UI53 /fo8QaZmvKCDPA==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 18 Dec 2023 17:30:13 +0100 Message-ID: <6fbee1e6544d1abcaf781fc246004de494396868.1702916397.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 is a followup to 1cebc334a77030c0c94955981652f4df7608c9e3. * guix/build-system/gnu.scm (gnu-build, gnu-cross-build): #:locale now defaults to "C.UTF-8". * guix/build/gnu-build-system.scm (install-locale): Likewise. * gnu/packages/linux.scm (util-linux)[arguments]: In ‘pre-check’ phase, remove ‘invalid-multibyte’ modification so the test runs under C.UTF-8. Change-Id: I9a4bfe564bcd8bbd0d57ba04568eb6b8020bd051 --- gnu/packages/linux.scm | 6 +----- guix/build-system/gnu.scm | 4 ++-- guix/build/gnu-build-system.scm | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 430645e4ad..0572ad3a73 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2257,11 +2257,7 @@ (define-public util-linux ;; Change the test to refer to the right file. (substitute* "tests/ts/misc/mcookie" (("/etc/services") - services)) - - ;; The C.UTF-8 locale does not exist in our libc. - (substitute* "tests/ts/column/invalid-multibyte" - (("C\\.UTF-8") "en_US.utf8"))))) + services))))) (add-before 'check 'disable-setarch-test (lambda _ ;; The setarch tests are unreliable in QEMU's user-mode diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index ed1dc33c76..0f886fe21d 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -361,7 +361,7 @@ (define* (gnu-build name inputs (make-dynamic-linker-cache? #t) (license-file-regexp %license-file-regexp) (phases '%standard-phases) - (locale "en_US.utf8") + (locale "C.UTF-8") (system (%current-system)) (build (nix-system->gnu-triplet system)) (imported-modules %default-gnu-imported-modules) @@ -501,7 +501,7 @@ (define* (gnu-cross-build name (license-file-regexp %license-file-regexp) (phases '%standard-phases) - (locale "en_US.utf8") + (locale "C.UTF-8") (system (%current-system)) (build (nix-system->gnu-triplet system)) (imported-modules %default-gnu-imported-modules) diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index ef5873d793..39707e7ace 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -123,7 +123,7 @@ (define* (set-paths #:key target inputs native-inputs native-search-paths))) (define* (install-locale #:key - (locale "en_US.utf8") + (locale "C.UTF-8") (locale-category LC_ALL) #:allow-other-keys) "Try to install LOCALE; emit a warning if that fails. The main goal is to From patchwork Mon Dec 18 16:30:14 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: 57682 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 50DC427BBE9; Mon, 18 Dec 2023 16:32:41 +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 EAE2527BBE2 for ; Mon, 18 Dec 2023 16:32:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rFGXK-0001mU-2Y; Mon, 18 Dec 2023 11:32:10 -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 1rFGXA-0001kI-Gy for guix-patches@gnu.org; Mon, 18 Dec 2023 11:32:04 -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 1rFGXA-0007eL-6k for guix-patches@gnu.org; Mon, 18 Dec 2023 11:32:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rFGXC-00074n-5E for guix-patches@gnu.org; Mon, 18 Dec 2023 11:32:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67824] [PATCH core-updates v2 3/9] gnu: commencement: Remove =?utf-8?b?4oCYZ2xpYmMtdXRmOC1sb2NhbGVz4oCZ?= from =?utf-8?b?4oCYJWZpbmFs?= =?utf-8?b?LWlucHV0c+KAmS4=?= Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Dec 2023 16:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67824 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67824@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 67824-submit@debbugs.gnu.org id=B67824.170291706526007 (code B ref 67824); Mon, 18 Dec 2023 16:32:02 +0000 Received: (at 67824) by debbugs.gnu.org; 18 Dec 2023 16:31:05 +0000 Received: from localhost ([127.0.0.1]:33374 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFGWG-0006kh-Q3 for submit@debbugs.gnu.org; Mon, 18 Dec 2023 11:31:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44510) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFGW4-0006Lh-K5 for 67824@debbugs.gnu.org; Mon, 18 Dec 2023 11:30:53 -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 1rFGVx-0007SB-9W; Mon, 18 Dec 2023 11:30: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:References:In-Reply-To:Date:Subject:To: From; bh=r9wGA/+CXEPOp5EOH40rNSzpYDxMrzUg+jLA9nlIY2s=; b=Z82PEJ+00RZZUIpp9s4/ dnDck43eElaV0pHeGZJvgp0fw+EOfgpu+LlDyduBUv0yNItRxuJTN1pi3BLoSYJgMuHfSIVwJLVk2 ASL8goit2Npp1Ksbqo1G33iR1fq6mUSceuPwg+e4jeMso0l3AG8AlZgyZUpmeEipfIMyCiZ4QgwUy TJXvDT9Z8jsm/f5YOgZQQGenotpqoJTs2PX5QYMq2cFg0lmQ1klvR7KJGNvYGx3Er+pXQPK/SOTNl 7UU4xfjrwYpsMSJhkcsvRL163bRvPQQk3ZXunAevcbZiVQAm8A2mXgyIaQQcrqYW2rVbxtUs6jClu VEk0uoURCHqbsQ==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 18 Dec 2023 17:30:14 +0100 Message-ID: <8f609fdf9e20d9140f149c8255b92334fae84f62.1702916397.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/commencement.scm (%boot5-inputs): Make an alias for ‘%boot4-inputs’. (with-boot5): Turn into an alias for ‘with-boot4’. (%final-inputs): Override ‘native-inputs’ of GAWK. Remove "locales" entry. (canonical-package): Add “glibc-utf8-locales” entry. * gnu/packages/base.scm (libc-utf8-locales-for-target): Use ‘canonical-package’. * gnu/packages/gawk.scm (gawk)[native-inputs]: New field. * gnu/packages/texinfo.scm (texinfo)[native-inputs]: Add ‘libc-utf8-locales-for-target’. Change-Id: I2283ffc6c6000c98ad2db89c04d581e050667c94 --- gnu/packages/base.scm | 11 ++++++++--- gnu/packages/commencement.scm | 31 +++++++++++++++---------------- gnu/packages/gawk.scm | 6 +++++- gnu/packages/texinfo.scm | 7 +++++-- 4 files changed, 33 insertions(+), 22 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 235ad7fecc..d31c0b0772 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1593,9 +1593,14 @@ (define* (libc-locales-for-target #:optional (define* (libc-utf8-locales-for-target #:optional (target (or (%current-target-system) (%current-system)))) - (if (target-hurd? target) - glibc-utf8-locales/hurd - glibc-utf8-locales)) + "Return the glibc UTF-8 locale package for TARGET." + ;; Note: To avoid circular dependencies (such as: texinfo -> + ;; glibc-utf8-locales -> glibc -> texinfo), refer to + ;; 'glibc-utf8-locales-final' via 'canonical-package'. + (canonical-package + (if (target-hurd? target) + glibc-utf8-locales/hurd + glibc-utf8-locales))) (define-public tzdata (package diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 988e497ee7..f4882f7cdd 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3394,17 +3394,11 @@ (define-public ld-gold-wrapper #:guile guile-final #:bash bash-final)) -(define (%boot5-inputs) - ;; Now with UTF-8 locales. Remember that the bootstrap binaries were built - ;; with an older libc, which cannot load the new locale format. See - ;; . - `(("locales" ,(if (target-hurd?) - glibc-utf8-locales-final/hurd - glibc-utf8-locales-final)) - ,@(%boot4-inputs))) - -(define with-boot5 - (package-with-explicit-inputs %boot5-inputs)) +;; There used to be a "stage 5" including a variant of the +;; 'glibc-utf8-locales' package. This is no longer necessary since 'glibc' +;; embeds the "C.UTF-8" locale, but these aliases are kept for convenience. +(define %boot5-inputs %boot4-inputs) +(define with-boot5 with-boot4) (define gnu-make-final ;; The final GNU Make, which uses the final Guile. @@ -3493,7 +3487,11 @@ (define-public %final-inputs ("diffutils" ,diffutils) ("patch" ,patch) ("findutils" ,findutils) - ("gawk" ,gawk))) + ("gawk" ,(package/inherit gawk + (native-inputs + (list (if (target-hurd?) + glibc-utf8-locales-final/hurd + glibc-utf8-locales-final))))))) ("sed" ,sed-final) ("grep" ,grep-final) ("xz" ,xz-final) @@ -3504,10 +3502,7 @@ (define-public %final-inputs ("binutils" ,binutils-final) ("gcc" ,gcc-final) ("libc" ,glibc-final) - ("libc:static" ,glibc-final "static") - ("locales" ,(if (target-hurd? (%current-system)) - glibc-utf8-locales-final/hurd - glibc-utf8-locales-final))))))) + ("libc:static" ,glibc-final "static")))))) (define-public canonical-package (let ((name->package (mlambda (system) @@ -3518,6 +3513,10 @@ (define-public canonical-package package result)))) vlist-null `(("guile" ,guile-final) + ("glibc-utf8-locales" + ,(if (target-hurd? system) + glibc-utf8-locales-final/hurd + glibc-utf8-locales-final)) ,@(%final-inputs system)))))) (lambda (package) "Return the 'canonical' variant of PACKAGE---i.e., if PACKAGE is one of diff --git a/gnu/packages/gawk.scm b/gnu/packages/gawk.scm index 2d8bc581ef..476865ada3 100644 --- a/gnu/packages/gawk.scm +++ b/gnu/packages/gawk.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès +;;; Copyright © 2012-2016, 2023 Ludovic Courtès ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2018, 2022, 2023 Efraim Flashner ;;; Copyright © 2021, 2022 Marius Bakke @@ -79,6 +79,10 @@ (define-public gawk (("#! /usr/bin/gawk") (string-append "#!" (which "gawk"))))))))) + ;; Tests explicitly require en_US.UTF-8, fr_FR.UTF-8, ru_RU.UTF-8 and + ;; ja_JP.UTF-8. + (native-inputs (list (libc-utf8-locales-for-target))) + (inputs (list libsigsegv ;; Use the full-fledged Bash package, otherwise the test suite ;; sometimes fail non-deterministically. diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index ab4583071e..92c9d800a9 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -38,6 +38,7 @@ (define-module (gnu packages texinfo) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages gettext) #:use-module (gnu packages ncurses) @@ -79,10 +80,12 @@ (define-public texinfo #:tests? ,(and (not (target-hurd?)) (not (%current-target-system))))) (inputs (list ncurses perl)) + ;; When cross-compiling, texinfo will build some of its own binaries with ;; the native compiler. This means ncurses is needed both in both inputs - ;; and native-inputs. - (native-inputs (list perl ncurses)) + ;; and native-inputs. Some of its tests require extra locales such as + ;; fr_FR.UTF-8. + (native-inputs (list perl ncurses (libc-utf8-locales-for-target))) (native-search-paths ;; This is the variable used by the standalone Info reader. From patchwork Mon Dec 18 16:30:15 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: 57681 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 ECDF527BBEB; Mon, 18 Dec 2023 16:32:40 +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 5E36327BBE9 for ; Mon, 18 Dec 2023 16:32:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rFGXO-0001my-T1; Mon, 18 Dec 2023 11:32:14 -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 1rFGXD-0001kX-09 for guix-patches@gnu.org; Mon, 18 Dec 2023 11:32:04 -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 1rFGXC-0007eq-5u; Mon, 18 Dec 2023 11:32:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rFGXC-00074v-JB; Mon, 18 Dec 2023 11:32:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67824] [PATCH core-updates v2 4/9] profiles: Use C.UTF-8 instead of =?utf-8?b?4oCYZ2xpYmMtdXRmOC1sb2NhbGVz4oCZ?= where possible. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Mon, 18 Dec 2023 16:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67824 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67824@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 67824-submit@debbugs.gnu.org id=B67824.170291706626061 (code B ref 67824); Mon, 18 Dec 2023 16:32:02 +0000 Received: (at 67824) by debbugs.gnu.org; 18 Dec 2023 16:31:06 +0000 Received: from localhost ([127.0.0.1]:33378 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFGWH-0006lS-HU for submit@debbugs.gnu.org; Mon, 18 Dec 2023 11:31:06 -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 1rFGW7-0006Qo-Ak for 67824@debbugs.gnu.org; Mon, 18 Dec 2023 11:30:56 -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 1rFGW0-0007UN-1l; Mon, 18 Dec 2023 11:30: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=TwvTpdL8/xMKO5FWaa90V1adDxfqVe8ftAvsBI051cA=; b=fp+z3oil6ne74o7cmiu4 z0EIg153fM5Zy2qSfsisxYi0VMa2lBcTHlKKGoQGllF9xlyUSRNcE0k7ytBYzwC9NLEtiSpHAqTCk Ph5k+Onhlr5icgWu6ufLzjoyejAj1BsukXZmkZ1JqCDOBnGdZ5PAOlU7nkUhTvBS2yZzOcJOE4NUA QTyu0l+n3HqNX33+xo5IuVvAmYXEzVvE/h/gK3EZVABHO3ZyhO7S+JFCFHlbyNm1Xe9RdzkkYWFQs zWSQI2b50CLYyrC8ZoB6+C1b9b14NIFCtzVpgYAccEc5WCF6sGT64/XE6Lok6Zsyt2MwYPj7vJtDm g+l5Tu5zjCvtVQ==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 18 Dec 2023 17:30:15 +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 This is a followup to 1cebc334a77030c0c94955981652f4df7608c9e3. * guix/profiles.scm (ca-certificate-bundle)[libc-utf8-locales-for-target]: Remove. [build]: Use “C.UTF-8” instead of “en_US.utf8”. (profile-derivation)[libc-utf8-locales-for-target]: Remove. [set-utf8-locale]: Rewrite to a gexp that calls ‘setlocale’ for “C.UTF-8”. * tests/profiles.scm ("profile-derivation, cross-compilation"): Remove ‘locales’ variable and related check. Change-Id: I7cb148b9149fe5fbe5b9b1b25fdce1002ad1f37e --- guix/profiles.scm | 33 +++++---------------------------- tests/profiles.scm | 7 +------ 2 files changed, 6 insertions(+), 34 deletions(-) diff --git a/guix/profiles.scm b/guix/profiles.scm index ce2f8337bf..da7790d819 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -1125,11 +1125,6 @@ (define* (ca-certificate-bundle manifest #:optional system) MANIFEST. Single-file bundles are required by programs such as Git and Lynx." ;; See ;; for a discussion. - - (define libc-utf8-locales-for-target ;lazy reference - (module-ref (resolve-interface '(gnu packages base)) - 'libc-utf8-locales-for-target)) - (define build (with-imported-modules '((guix build utils)) #~(begin @@ -1161,13 +1156,7 @@ (define* (ca-certificate-bundle manifest #:optional system) ;; Some file names in the NSS certificates are UTF-8 encoded so ;; install a UTF-8 locale. - (setenv "LOCPATH" - (string-append #+(libc-utf8-locales-for-target system) - "/lib/locale/" - #+(version-major+minor - (package-version - (libc-utf8-locales-for-target system))))) - (setlocale LC_ALL "en_US.utf8") + (setlocale LC_ALL "C.UTF-8") (match (append-map ca-files '#$(manifest-inputs manifest)) (() @@ -1960,8 +1949,7 @@ (define* (profile-derivation manifest or TARGET is set, raise an error if MANIFEST contains a package that does not support SYSTEM. -When LOCALES? is true, the build is performed under a UTF-8 locale; this adds -a dependency on the 'glibc-utf8-locales' package. +When LOCALES? is true, the build is performed under a UTF-8 locale. When RELATIVE-SYMLINKS? is true, use relative file names for symlink targets. This is one of the things to do for the result to be relocatable. @@ -2004,21 +1992,10 @@ (define* (profile-derivation manifest (and (derivation? drv) (gexp-input drv))) extras)) - (define libc-utf8-locales-for-target ;lazy reference - (module-ref (resolve-interface '(gnu packages base)) - 'libc-utf8-locales-for-target)) - (define set-utf8-locale - ;; Some file names (e.g., in 'nss-certs') are UTF-8 encoded so - ;; install a UTF-8 locale. - (let ((locales (libc-utf8-locales-for-target - (or system (%current-system))))) - #~(begin - (setenv "LOCPATH" - #$(file-append locales "/lib/locale/" - (version-major+minor - (package-version locales)))) - (setlocale LC_ALL "en_US.utf8")))) + ;; Some file names (e.g., in 'nss-certs') are UTF-8 encoded so install a + ;; UTF-8 locale. Assume libc comes with a copy of C.UTF-8. + #~(setlocale LC_ALL "C.UTF-8")) (define builder (with-imported-modules '((guix build profiles) diff --git a/tests/profiles.scm b/tests/profiles.scm index ddd6d74f3b..e448137cff 100644 --- a/tests/profiles.scm +++ b/tests/profiles.scm @@ -463,7 +463,6 @@ (define glibc (target -> "arm-linux-gnueabihf") (grep (package->cross-derivation packages:grep target)) (sed (package->cross-derivation packages:sed target)) - (locales (package->derivation (packages:libc-utf8-locales-for-target))) (drv (profile-derivation manifest #:hooks '() #:locales? #t @@ -475,15 +474,11 @@ (define glibc (and (string-suffix? name input) input))) (derivation-inputs drv)))) - ;; The inputs for grep and sed should be cross-build derivations, but that - ;; for the glibc-utf8-locales should be a native build. (return (and (string=? (derivation-system drv) (%current-system)) (string=? (find-input packages:grep) (derivation-file-name grep)) (string=? (find-input packages:sed) - (derivation-file-name sed)) - (string=? (find-input (packages:libc-utf8-locales-for-target)) - (derivation-file-name locales)))))) + (derivation-file-name sed)))))) (test-assert "package->manifest-entry defaults to \"out\"" (let ((outputs (package-outputs packages:glibc))) From patchwork Mon Dec 18 16:30:16 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: 57678 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 E255127BBEC; Mon, 18 Dec 2023 16:32:25 +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 7C53227BBEA for ; Mon, 18 Dec 2023 16:32:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rFGXH-0001lT-R6; Mon, 18 Dec 2023 11:32:07 -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 1rFGXD-0001kY-0Z for guix-patches@gnu.org; Mon, 18 Dec 2023 11:32:04 -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 1rFGXC-0007et-75; Mon, 18 Dec 2023 11:32:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rFGXC-000754-Up; Mon, 18 Dec 2023 11:32:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67824] [PATCH core-updates v2 5/9] packages: Output and error ports are line-buffered in =?utf-8?b?4oCYcGF0Y2gtYW5kLXJlcGFja+KAmS4=?= Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Mon, 18 Dec 2023 16:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67824 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67824@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 67824-submit@debbugs.gnu.org id=B67824.170291706726092 (code B ref 67824); Mon, 18 Dec 2023 16:32:02 +0000 Received: (at 67824) by debbugs.gnu.org; 18 Dec 2023 16:31:07 +0000 Received: from localhost ([127.0.0.1]:33380 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFGWI-0006mG-4K for submit@debbugs.gnu.org; Mon, 18 Dec 2023 11:31:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44542) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFGW8-0006Sb-5s for 67824@debbugs.gnu.org; Mon, 18 Dec 2023 11:30:56 -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 1rFGW0-0007UT-TW; Mon, 18 Dec 2023 11:30: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=gJLkm5f50IdnsS1kUIz/qsUkKwRYPGDpDAcRBMXWB7A=; b=FKt88P1YWR+syKugEtV2 nEwwD0X9mmdcfY0sWLPBfRUiKZaIWrVHfpc84iSJFm2yuJk2jkbSJ4LdPeVmmGZCQrEDmiIQRDuLi cONfOyL6bGE1bwPVx0GSV4yeMNHfEeDixqGogoatM2YAeU4P2Nh2xSHerBY3MRag5uZlAVlLYKStT 9LnKPXoHNVQD7wk0KhjHef5h1Rnw+Y8iO24zuhh5qsPLj7ypxabqMB/oCSlHlA2lIX9EkXV3a5xo2 AEGiKvq/jj9eIgV4WxoHtsmLDOCPu87MYtrlkQDlY+Rq4DOEf3zrUob4L/w2ydJACgeOeDfA8tvE5 5BzB1ZgkvNbqiQ==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 18 Dec 2023 17:30:16 +0100 Message-ID: <568767c79a40cf44a01fe9b57372defce13ec620.1702916397.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 * guix/packages.scm (patch-and-repack): Add ‘setvbuf’ calls. Change-Id: I039bb6407263d5172bf0bc716bda6860dc2615fb --- guix/packages.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/guix/packages.scm b/guix/packages.scm index 4b0c478ff4..cb8db925f8 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -1007,6 +1007,11 @@ (define* (patch-and-repack source patches '("--no-recursion" "--files-from=.file_list")))) + (let ((line (cond-expand (guile-2.0 _IOLBF) + (else 'line)))) + (setvbuf (current-output-port) line) + (setvbuf (current-error-port) line)) + ;; Encoding/decoding errors shouldn't be silent. (fluid-set! %default-port-conversion-strategy 'error) From patchwork Mon Dec 18 16:30:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 57680 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 F120E27BBEB; Mon, 18 Dec 2023 16:32:35 +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 5D6D627BBEA for ; Mon, 18 Dec 2023 16:32:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rFGXR-0001pt-5T; Mon, 18 Dec 2023 11:32:17 -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 1rFGXC-0001kV-Vo for guix-patches@gnu.org; Mon, 18 Dec 2023 11:32:04 -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 1rFGXB-0007eh-Dc for guix-patches@gnu.org; Mon, 18 Dec 2023 11:32:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rFGXD-00075C-CC for guix-patches@gnu.org; Mon, 18 Dec 2023 11:32:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67824] [PATCH core-updates v2 6/9] gnu: glibc-utf8-locales: Add the 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: Mon, 18 Dec 2023 16:32:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67824 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67824@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 67824-submit@debbugs.gnu.org id=B67824.170291706726127 (code B ref 67824); Mon, 18 Dec 2023 16:32:03 +0000 Received: (at 67824) by debbugs.gnu.org; 18 Dec 2023 16:31:07 +0000 Received: from localhost ([127.0.0.1]:33384 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFGWI-0006ml-Nw for submit@debbugs.gnu.org; Mon, 18 Dec 2023 11:31:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52752) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFGW9-0006UZ-6O for 67824@debbugs.gnu.org; Mon, 18 Dec 2023 11:30:57 -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 1rFGW1-0007Uc-Qb; Mon, 18 Dec 2023 11:30: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=tN+Fn29suZxK3b8EnX4BuK8bWqEj5AMsqDEwh9mq2sI=; b=Zuf2BoAr+ZwlKOi/qSHX 5Pn+12wAAPmpVDQzkpfdbNrJQXVsnHfIXBSKBSetXaCg/F78Kzu7aHi7uKOmickHn9Xjlod2qw4Uq GaNU5sXBVqVbKToeQwBtW4H0skHGr8VvuatNUn6/8izmL8uRVSSBpVtwnup+GAM/RRl2E7K4Htan/ kfBMxPzAGLSwHTociXW1LskmuBrBxCovBC3oZ9p9lYm0eV6csOJN6cbr/JLQ1WgNj3Atmaj2bLkPv 4mwu0wIc6fnN3IpombHiZuAiJsXwhcuoy/5g4uIELoqTYThz0M4afi8FcKbZ5SMwCknn9eR55shoL Ff8L/Tcd/0vtxQ==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 18 Dec 2023 17:30:17 +0100 Message-ID: <7f7ca40f6236f1456cdc5604549a60f8070d6514.1702916397.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 (%default-utf8-locales): Add "C". (make-glibc-utf8-locales): Delete "C" from LOCALES for glibc versions lower than or equal to 2.35. Change-Id: I6a6faa68dc18bf0f87c372109a17f476d3561278 --- gnu/packages/base.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index d31c0b0772..eab9ff411d 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1396,7 +1396,8 @@ (define-public (make-glibc-locales glibc) (define %default-utf8-locales ;; These are the locales commonly used for tests---e.g., in Guile's i18n ;; tests. - '("de_DE" "el_GR" "en_US" "fr_FR" "tr_TR")) + '("C" "de_DE" "el_GR" "en_US" "fr_FR" "tr_TR")) + (define*-public (make-glibc-utf8-locales glibc #:key (locales %default-utf8-locales) (name "glibc-utf8-locales")) @@ -1444,7 +1445,14 @@ (define*-public (make-glibc-utf8-locales glibc #:key (symlink (string-append locale ".utf8") (string-append localedir "/" locale ".UTF-8"))) - '#$locales))))) + + ;; The C.UTF-8 locale was introduced in 2.35 but it + ;; fails to build there: + ;; . + '#$(if (version>? (package-version this-package) + "2.35") + locales + (delete "C" locales))))))) (native-inputs (list glibc gzip)) (synopsis (if default-locales? (P_ "Small sample of UTF-8 locales") From patchwork Mon Dec 18 16:30:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 57684 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 3B28627BBE2; Mon, 18 Dec 2023 16:32:58 +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 DAB4227BBEA for ; Mon, 18 Dec 2023 16:32:56 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rFGXR-0001qF-DM; Mon, 18 Dec 2023 11:32:17 -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 1rFGXC-0001kU-VT for guix-patches@gnu.org; Mon, 18 Dec 2023 11:32:04 -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 1rFGXB-0007ek-RP for guix-patches@gnu.org; Mon, 18 Dec 2023 11:32:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rFGXD-00075K-Qb for guix-patches@gnu.org; Mon, 18 Dec 2023 11:32:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67824] [PATCH core-updates v2 7/9] gnu: glibc: Add patch for =?utf-8?b?4oCYdWNvbnRleHTigJk=?= on x86_64-gnu (GNU/Hurd). Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Dec 2023 16:32:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67824 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67824@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 67824-submit@debbugs.gnu.org id=B67824.170291706826144 (code B ref 67824); Mon, 18 Dec 2023 16:32:03 +0000 Received: (at 67824) by debbugs.gnu.org; 18 Dec 2023 16:31:08 +0000 Received: from localhost ([127.0.0.1]:33386 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFGWJ-0006nK-Hz for submit@debbugs.gnu.org; Mon, 18 Dec 2023 11:31:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52760) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFGW9-0006Ve-VB for 67824@debbugs.gnu.org; Mon, 18 Dec 2023 11:30:58 -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 1rFGW2-0007Un-Ko; Mon, 18 Dec 2023 11:30: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=dPHtgIeOoli4nEd9fPV/besd3+isLEewGoQH9UkRGDc=; b=XBMrjGPe2L2rI+QrzZLr EmjOftVa8OdUxfeAc6Aln0M+6JE8RRrxEmZvNuR2vtttaaAcrc2fuklxBoI1No6nGlMxgkvPIwnuU fKn9nUtaFh9myiRXMqKdQ9h0b5gi5cKB2RZGCRcETp0jJcqGeoa6dm3Z91uNq0llFXf+9B6wmxfiB /MVW1gcMNcq1xoJ0q9eS5DhVyGePLfiHzcLkxWoFZq95Flg0fEM+81k85CM2i+gPOXv7UiPyn2NxY U8uWsf/RD/E/2Acqp6JtSQisC4/VMQXlrXQK4Y/OEwmGnR0TBnAeIj2KbIejrEK9T1dk0WtH1TnDE FAHCN5XmrDQ8cw==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 18 Dec 2023 17:30:18 +0100 Message-ID: <2f3b64b9d967b4eea5cbdb32c859f4e3ac3b1a83.1702916397.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 Suggested by Sergey Bugaev. * gnu/packages/patches/glibc-2.38-hurd-ucontext.patch: New file. * gnu/packages/base.scm (glibc)[source]: Use it. * gnu/local.mk (dist_patch_DATA): Add it. Change-Id: Ib74e93f2414eda2ec4b3e01fc2bb67b02838fabb --- gnu/local.mk | 1 + gnu/packages/base.scm | 1 + .../patches/glibc-2.38-hurd-ucontext.patch | 87 +++++++++++++++++++ 3 files changed, 89 insertions(+) create mode 100644 gnu/packages/patches/glibc-2.38-hurd-ucontext.patch diff --git a/gnu/local.mk b/gnu/local.mk index ff2f82a23a..e92cf871ad 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1320,6 +1320,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-hurd-ucontext.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 \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index eab9ff411d..e2a952cc42 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -813,6 +813,7 @@ (define-public glibc "glibc-supported-locales.patch" "glibc-2.37-hurd-clock_t_centiseconds.patch" "glibc-2.37-hurd-local-clock_gettime_MONOTONIC.patch" + "glibc-2.38-hurd-ucontext.patch" "glibc-hurd-mach-print.patch" "glibc-hurd-gettyent.patch" "glibc-hurd-getauxval.patch")))) diff --git a/gnu/packages/patches/glibc-2.38-hurd-ucontext.patch b/gnu/packages/patches/glibc-2.38-hurd-ucontext.patch new file mode 100644 index 0000000000..03a6132666 --- /dev/null +++ b/gnu/packages/patches/glibc-2.38-hurd-ucontext.patch @@ -0,0 +1,87 @@ +commit 29d4591b07a4da53320e949557c6946c62c26bde +Author: Samuel Thibault +Date: Thu Sep 28 00:07:18 2023 +0200 + + hurd: Drop REG_GSFS and REG_ESDS from x86_64's ucontext + + These are useless on x86_64, and __NGREG was actually wrong with them. + +diff --git a/sysdeps/mach/hurd/x86/trampoline.c b/sysdeps/mach/hurd/x86/trampoline.c +index 6318c9528a..bc3f15e1e0 100644 +--- a/sysdeps/mach/hurd/x86/trampoline.c ++++ b/sysdeps/mach/hurd/x86/trampoline.c +@@ -79,8 +79,8 @@ static void fill_ucontext (ucontext_t *uc, const struct sigcontext *sc) + + /* Registers. */ + #ifdef __x86_64__ +- memcpy (&uc->uc_mcontext.gregs[REG_GSFS], &sc->sc_gs, +- (REG_ERR - REG_GSFS) * sizeof (long)); ++ memcpy (&uc->uc_mcontext.gregs[REG_R8], &sc->sc_r8, ++ (REG_ERR - REG_R8) * sizeof (long)); + #else + memcpy (&uc->uc_mcontext.gregs[REG_GS], &sc->sc_gs, + (REG_TRAPNO - REG_GS) * sizeof (int)); +diff --git a/sysdeps/mach/hurd/x86_64/bits/sigcontext.h b/sysdeps/mach/hurd/x86_64/bits/sigcontext.h +index 6396054463..7facc587b8 100644 +--- a/sysdeps/mach/hurd/x86_64/bits/sigcontext.h ++++ b/sysdeps/mach/hurd/x86_64/bits/sigcontext.h +@@ -59,13 +59,7 @@ struct sigcontext + } + trampoline.c knows this, so it must be changed if this changes. */ + +-#define sc_i386_thread_state sc_gs /* Beginning of correspondence. */ +- /* Segment registers. */ +- int sc_gs; +- int sc_fs; +- int sc_es; +- int sc_ds; +- ++#define sc_i386_thread_state sc_r8 /* Beginning of correspondence. */ + long sc_r8; + long sc_r9; + long sc_r10; +diff --git a/sysdeps/mach/x86/thread_state.h b/sysdeps/mach/x86/thread_state.h +index 8c419515f9..e237e46cb2 100644 +--- a/sysdeps/mach/x86/thread_state.h ++++ b/sysdeps/mach/x86/thread_state.h +@@ -34,12 +34,13 @@ + #define PC rip + #define SP ursp + #define SYSRETURN rax ++#define MACHINE_THREAD_STATE_FIX_NEW(ts) do { \ ++ asm ("mov %%cs, %w0" : "=q" ((ts)->cs)); \ ++} while(0) + #else + #define PC eip + #define SP uesp + #define SYSRETURN eax +-#endif +- + #define MACHINE_THREAD_STATE_FIX_NEW(ts) do { \ + asm ("mov %%cs, %w0" : "=q" ((ts)->cs)); \ + asm ("mov %%ds, %w0" : "=q" ((ts)->ds)); \ +@@ -47,6 +48,7 @@ + asm ("mov %%fs, %w0" : "=q" ((ts)->fs)); \ + asm ("mov %%gs, %w0" : "=q" ((ts)->gs)); \ + } while(0) ++#endif + + struct machine_thread_all_state + { +diff --git a/sysdeps/x86_64/sys/ucontext.h b/sysdeps/x86_64/sys/ucontext.h +index d73a893795..f1b6be77a7 100644 +--- a/sysdeps/x86_64/sys/ucontext.h ++++ b/sysdeps/x86_64/sys/ucontext.h +@@ -47,11 +47,7 @@ typedef greg_t gregset_t[__NGREG]; + /* Number of each register in the `gregset_t' array. */ + enum + { +- REG_GSFS = 0, /* Actually int gs, fs. */ +-# define REG_GSFS REG_GSFS +- REG_ESDS, /* Actually int es, ds. */ +-# define REG_ESDS REG_ESDS +- REG_R8, ++ REG_R8 = 0, + # define REG_R8 REG_R8 + REG_R9, + # define REG_R9 REG_R9 From patchwork Mon Dec 18 16:30:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 57679 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 50C0F27BBEA; Mon, 18 Dec 2023 16:32:27 +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 763DD27BBE9 for ; Mon, 18 Dec 2023 16:32:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rFGXQ-0001oP-2h; Mon, 18 Dec 2023 11:32:16 -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 1rFGXD-0001kZ-6l for guix-patches@gnu.org; Mon, 18 Dec 2023 11:32:04 -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 1rFGXC-0007f5-Qv for guix-patches@gnu.org; Mon, 18 Dec 2023 11:32:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rFGXE-00075f-Oq for guix-patches@gnu.org; Mon, 18 Dec 2023 11:32:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67824] [PATCH core-updates v2 8/9] build-system/gnu: Turn PID 1 into an =?utf-8?b?4oCcaW5pdOKAnS1zdHlsZQ==?= process by default. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Dec 2023 16:32:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67824 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67824@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Carlo Zancanaro Received: via spool by 67824-submit@debbugs.gnu.org id=B67824.170291706926207 (code B ref 67824); Mon, 18 Dec 2023 16:32:04 +0000 Received: (at 67824) by debbugs.gnu.org; 18 Dec 2023 16:31:09 +0000 Received: from localhost ([127.0.0.1]:33390 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFGWL-0006nw-0R for submit@debbugs.gnu.org; Mon, 18 Dec 2023 11:31:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52784) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFGWC-0006YG-Gt for 67824@debbugs.gnu.org; Mon, 18 Dec 2023 11:31:01 -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 1rFGW3-0007V0-S1; Mon, 18 Dec 2023 11:30: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=us/RZNPz9QE+U7JBcmSVn0PlJR0j2F9GiJmk2W8LmWg=; b=i9OOXkMDu2IrIv0DsUrW ENHyfwEL75pS53trqp/KKt5pGWm7xjbgewxfivc19XDiH23bk2/XjqlVEBOwiW3c7AygwABoOjCOQ Vv8faB56DXLNQ4RrJ5n5IIy0I8fk9Cnr+Jq8+bpDq/eAXW7lxMXdFA9RO2xVftArNDCrDyAAAcXAi VTUSCebv3FNgYbVv3EMKgPhtIgmuXe6KAlYj7NiABBl32a7oOT+wcEhrof1RbbgC9fFwo2CMGthMG Cj9YPXtFC0YxUpva1ZVU3g1J/t+S+2QObtVZZv2mY+c9j6t2k+Go8OlEa0UuElKG3UEY9DkpsdPYB B1J3TDY+YEn0Dg==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 18 Dec 2023 17:30:19 +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 Fixes . * guix/build/gnu-build-system.scm (separate-from-pid1): New procedure. (%standard-phases): Add it. * guix/build-system/gnu.scm (gnu-build): Add #:separate-from-pid1? and honor it. (gnu-cross-build): Likewise. Reported-by: Carlo Zancanaro Change-Id: I6f3bc8d8186d1a571f983a38d5e3fd178ffa2678 --- guix/build-system/gnu.scm | 4 ++++ guix/build/gnu-build-system.scm | 39 ++++++++++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index 0f886fe21d..6a89bcc0d8 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -362,6 +362,7 @@ (define* (gnu-build name inputs (license-file-regexp %license-file-regexp) (phases '%standard-phases) (locale "C.UTF-8") + (separate-from-pid1? #t) (system (%current-system)) (build (nix-system->gnu-triplet system)) (imported-modules %default-gnu-imported-modules) @@ -404,6 +405,7 @@ (define* (gnu-build name inputs (sexp->gexp phases) phases) #:locale #$locale + #:separate-from-pid1? #$separate-from-pid1? #:bootstrap-scripts #$bootstrap-scripts #:configure-flags #$(if (pair? configure-flags) (sexp->gexp configure-flags) @@ -502,6 +504,7 @@ (define* (gnu-cross-build name (license-file-regexp %license-file-regexp) (phases '%standard-phases) (locale "C.UTF-8") + (separate-from-pid1? #t) (system (%current-system)) (build (nix-system->gnu-triplet system)) (imported-modules %default-gnu-imported-modules) @@ -547,6 +550,7 @@ (define* (gnu-cross-build name (sexp->gexp phases) phases) #:locale #$locale + #:separate-from-pid1? #$separate-from-pid1? #:bootstrap-scripts #$bootstrap-scripts #:configure-flags #$configure-flags #:make-flags #$make-flags diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index 39707e7ace..51b8f9acbf 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -72,6 +72,42 @@ (define (first-subdirectory directory) ((first . _) first) (_ #f))) +(define* (separate-from-pid1 #:key (separate-from-pid1? #t) + #:allow-other-keys) + "When running as PID 1 and SEPARATE-FROM-PID1? is true, run build phases as +a child process; PID 1 then becomes responsible for reaping child processes." + (if separate-from-pid1? + (if (= 1 (getpid)) + (dynamic-wind + (const #t) + (lambda () + (match (primitive-fork) + (0 #t) + (builder-pid + (format (current-error-port) + "build process now running as PID ~a~%" + builder-pid) + (let loop () + ;; Running as PID 1 so take responsibility for reaping + ;; child processes. + (match (waitpid WAIT_ANY) + ((pid . status) + (if (= pid builder-pid) + (if (zero? status) + (primitive-exit 0) + (begin + (format (current-error-port) + "build process ~a exited with status ~a~%" + pid status) + (primitive-exit 1))) + (loop)))))))) + (const #t)) + (format (current-error-port) "not running as PID 1 (PID: ~a)~%" + (getpid))) + (format (current-error-port) + "build process running as PID ~a; not forking~%" + (getpid)))) + (define* (set-paths #:key target inputs native-inputs (search-paths '()) (native-search-paths '()) #:allow-other-keys) @@ -872,7 +908,8 @@ (define %standard-phases ;; Standard build phases, as a list of symbol/procedure pairs. (let-syntax ((phases (syntax-rules () ((_ p ...) `((p . ,p) ...))))) - (phases set-SOURCE-DATE-EPOCH set-paths install-locale unpack + (phases separate-from-pid1 + set-SOURCE-DATE-EPOCH set-paths install-locale unpack bootstrap patch-usr-bin-file patch-source-shebangs configure patch-generated-file-shebangs From patchwork Mon Dec 18 16:30:20 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: 57683 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 28B1127BBEC; Mon, 18 Dec 2023 16:32:57 +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 89CD927BBE2 for ; Mon, 18 Dec 2023 16:32:56 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rFGXR-0001qD-C4; Mon, 18 Dec 2023 11:32:17 -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 1rFGXG-0001lL-7E for guix-patches@gnu.org; Mon, 18 Dec 2023 11:32:07 -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 1rFGXF-0007fs-Ng for guix-patches@gnu.org; Mon, 18 Dec 2023 11:32:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rFGXE-00075V-AA; Mon, 18 Dec 2023 11:32:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67824] [PATCH core-updates v2 9/9] gnu: glib: Skip test that fails with glibc 2.38. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Mon, 18 Dec 2023 16:32:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67824 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67824@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan Received: via spool by 67824-submit@debbugs.gnu.org id=B67824.170291706926167 (code B ref 67824); Mon, 18 Dec 2023 16:32:04 +0000 Received: (at 67824) by debbugs.gnu.org; 18 Dec 2023 16:31:09 +0000 Received: from localhost ([127.0.0.1]:33388 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFGWK-0006nd-Gg for submit@debbugs.gnu.org; Mon, 18 Dec 2023 11:31:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52772) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFGWC-0006Xi-10 for 67824@debbugs.gnu.org; Mon, 18 Dec 2023 11:31: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 1rFGW4-0007V9-NI; Mon, 18 Dec 2023 11:30: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=L42db8QBpkkS7mLjYOdS1Zt7UdFfrQfMW4IzOoje71c=; b=eEj4yUpmV42nj4E403c6 yvLyg2N3U/fQ9oIQq87havzFMXpx67dcif0VIVfwiPjdI4i1r4fSvzU/LgnbC4Ti2Da1CRKuoE49j uC1wa5isLPZZe+JH8hcXTZFxcReSKDZNkcbndByBfhTKc9PC9GJIWbv+JSKKplmR9O+2opHsKejwt I0hP1aeHePsv+E4nAeU37Z5ezA51oqJs5EuAfpWifckEltpRNgfgAEPIGoqb1o8hyzPBZGEcsm+BG wq54o4tFalEmw9B6edqCE4XegN8dCC7RTyvmVF/OMeKdwCLyAqFBq7mjMSdZDOvkN9YlAApZJAapW 35eWeRf4goVHDw==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 18 Dec 2023 17:30:20 +0100 Message-ID: <08c866533e2a76bcf91149208c1323ecbfcff4cd.1702916397.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/glib.scm (glib)[arguments]: In ‘disable-failing-tests’ phase, substitute “glib/tests/error.c”. Change-Id: I9e3f5f1f5f55d08c83fbde3b79931987df27ebdf --- gnu/packages/glib.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index dc8cf5800b..13f957f810 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2019, 2020, 2021 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2019, 2020, 2021, 2023 Ludovic Courtès ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2021 Mark H Weaver @@ -275,6 +275,10 @@ (define glib (substitute* '("contenttype.c" "gdbus-address-get-session.c" "gdbus-peer.c" "appinfo.c" "desktop-app-info.c") (("[ \t]*g_test_add_func.*;") ""))) + (substitute* "glib/tests/error.c" + ;; This test segfaults with glibc 2.38. + (("g_test_add_func.*new-valist/invalid.*" all) + (string-append "//" all "\n"))) #$@(if (target-x86-32?) ;; Comment out parts of timer.c that fail on i686 due to