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.