From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:1008:1e59::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id vyJSMLIFe2W5fQEAkFu2QA (envelope-from ) for ; Thu, 14 Dec 2023 14:40:02 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id oLUkJrIFe2XKFwAA62LTzQ (envelope-from ) for ; Thu, 14 Dec 2023 14:40:02 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=sDXq6sGm; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1702561202; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=r9wGA/+CXEPOp5EOH40rNSzpYDxMrzUg+jLA9nlIY2s=; b=Ra0REgs7dl+C0O7dslTkKNZFyoNsWxuSHYaNTLqnUuRkCZ/bcEkyEec1dyvtsVq1FSupBz nBScKmx1mFGDHb9cUa/tvvp8FxL7+o2NsqI3u3zcO2r2ot0yaGB/h45oGCKDp/MoOjkq97 qtt2IF/RRfp6RCSqBxgs3D5PzjZjyyccVSbjJP4oGChw1vClrs7BEoOjRU2AYErdx+at86 edJPKSHRG3u5Nr2fqf8qJyuq6ddHltnzN0RZeN1LxvIc9whskQlz7kAt+vfSvEU1S8xG3S 6kn9gjcfFc2CQr2NxwGEwvVRyin1EMoMcfreFXhfOGrLkH38koJHYSO6k8/WHA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=sDXq6sGm; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1702561202; a=rsa-sha256; cv=none; b=TKCG4PJ+hy1WTOBQzQbhehOD/9HVSP0aj7WTH+Whiwbu8+EEnpzBUqa0mq+0Lraeh493i7 Ho1iASfZz2x48DwBHKn5j1hErbp1c178ddvtPJJcGUOnA2EuGP85rMNO3LNq0U5CDz3uA6 wY8vvvkhljnt7W4koLu0TSoodH7r9i0br8ZeZPvQ7eD+zySBc0bT5KjyZ2RfKtyUEwbqBl SKSgoKyit+FKPioXGjjQ9E/zp5mIA4EvnSvVhMUfbeshjyHLf4yEz/eNUqcp1xam3oxtXu Asn4/HERjuPNQDdiRfVA4FoOpNqpgQ2B1VtoJbRYvHSTEC1osvsbOAEhNN/ptA== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 2FB4560614 for ; Thu, 14 Dec 2023 14:40:01 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rDlve-0005XO-Ou; Thu, 14 Dec 2023 08:39: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 1rDlvc-0005W4-8n for guix-patches@gnu.org; Thu, 14 Dec 2023 08:39: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 1rDlvc-0003WH-06 for guix-patches@gnu.org; Thu, 14 Dec 2023 08:39:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rDlvb-0007Gx-6w for guix-patches@gnu.org; Thu, 14 Dec 2023 08:39:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67824] [PATCH core-updates 3/6] gnu: commencement: Remove =?UTF-8?Q?=E2=80=98glibc-utf8-locales=E2=80=99?= from =?UTF-8?Q?=E2=80=98%final-inputs=E2=80=99.?= Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 14 Dec 2023 13:39: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.170256110727849 (code B ref 67824); Thu, 14 Dec 2023 13:39:03 +0000 Received: (at 67824) by debbugs.gnu.org; 14 Dec 2023 13:38:27 +0000 Received: from localhost ([127.0.0.1]:48961 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDlv0-0007Ev-5b for submit@debbugs.gnu.org; Thu, 14 Dec 2023 08:38:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58806) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDlux-0007EX-PZ for 67824@debbugs.gnu.org; Thu, 14 Dec 2023 08:38:24 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rDlus-0002xS-UX; Thu, 14 Dec 2023 08:38:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=r9wGA/+CXEPOp5EOH40rNSzpYDxMrzUg+jLA9nlIY2s=; b=sDXq6sGm8mnraPfx75Gx 97/rdbhdcdEUc1D4qf6ux7fDjbyeZ5ghnq/2D/UZDBHiC1fG0NqiX7wMB9CpVLSMSrqLqT/PDf5ZB YQ8DtcVRmE6EWN7qi4LrObvJ8mqu8KLi+6tb5bkGX4aQgTuolLVL2cd0caVpGdQwAw5mvJOjDYXA5 OPg8hb5BLYWOyyDanAl6DtbO5yfaW+knfmIlBmpf4hm8K2JoEzYzhdw1Upkbej5Cf2oJ9GX4b1lEx WZBs1NvMkJ+b2iZA/rtoiMdpy9bUVdz1BJq/VUhgfSCpb9zkzrnH0llixVL0lalcanLXYUJmDtofP THt2vw6lR65EPw==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Thu, 14 Dec 2023 14:37:39 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -5.85 X-Spam-Score: -5.85 X-Migadu-Queue-Id: 2FB4560614 X-TUID: dJ6G9DI43K97 * 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. -- 2.41.0