From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id QMZACaVNcmXNHAEAauVa8A:P1 (envelope-from ) for ; Thu, 07 Dec 2023 23:56:37 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id QMZACaVNcmXNHAEAauVa8A (envelope-from ) for ; Thu, 07 Dec 2023 23:56:37 +0100 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 04C4557DFD for ; Thu, 7 Dec 2023 23:56:37 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=ITNPirpM; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1701989797; 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=GPCEuBEsb/Vzau7AXdU6qmjDYauLbiHQxHOYBDuSKLo=; b=QCZ/dCBfVhyXwCaV+vFWVB9WFk9lTxpzT/EvzIwknPRp1/iU+dWf6tpBbSitKzFSyWla3M FUe2/OhpKNaktXe9FhPie5WGoad6LWzXQbjqDZ76NCZQwL1twJh5wCoB1e/9BWsVXtSVfS DbDyprPnebn5TqYxTie7ZnpmE218kwTHmQ8cVIWEj/4BZG17SvNA0J7KQJuVKGfNssEIwT cCPq+DEPSZHH/xbHRmudpWGv4vjNASmonUgSh1jeY0ZZmerjyWk2LvBRRAykx5hb3JXYnH /+rtjl2Q2q4J0OPIq1CJ+RCsYidsDc8jNl9mEZk/MTaUZE0pfRiM7l0qvuuIag== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1701989797; a=rsa-sha256; cv=none; b=jcduCy10N9x2c7XcfY5qwi18n4yThhatYTUwu9Je5QQ7zgWVPEo/xsp3O/yaLHOrFgCB6z R1d4swPfNONTUh2qYIq36+M9DhEvT09WRpbe2sT0yOZduJ9U231vFBVORD9dicS3i1ph63 Q5KaCDq3XZo97Sh0ivQhpYqJwwNV0e7jO4VWgxF+jnMhFS/vw0nEwnI2t/fwr3NbKqwmLo eE/n3tpflVdLrNfb1LL+7u6H1Q9gS3MG9gqILQcYgkhkE/23zFkijLLQA5scABqFZNGp2Q BhEc2K5FSXRlEz4LsB80ce5MF7DUjiw9mGiOtuvNGiH4mNbYWg7Ja0jc9uuQWA== 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=ITNPirpM; dmarc=pass (policy=none) header.from=gnu.org; 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" 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 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: mx11.migadu.com X-Migadu-Spam-Score: -5.85 X-Spam-Score: -5.85 X-Migadu-Queue-Id: 04C4557DFD X-TUID: Pf7x58aPn/aY This change ensures that $prefix/lib/locale, which now contains C.UTF-8 data, is always searched. Thus, “setlocale (LC_ALL, "C.UTF-8")” is guaranteed to always succeed. * gnu/packages/patches/glibc-2.37-versioned-locpath.patch: Adjust. Change-Id: I6aaf2757da98e811aa55e0959126065537cd8970 --- .../glibc-2.37-versioned-locpath.patch | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/gnu/packages/patches/glibc-2.37-versioned-locpath.patch b/gnu/packages/patches/glibc-2.37-versioned-locpath.patch index 8685f2c3b7..1f34292ad0 100644 --- a/gnu/packages/patches/glibc-2.37-versioned-locpath.patch +++ b/gnu/packages/patches/glibc-2.37-versioned-locpath.patch @@ -12,6 +12,20 @@ that variable. So, if GUIX_LOCPATH=/foo:/bar, locale data is searched for in That way, a single 'GUIX_LOCPATH' setting can work even if different libc versions coexist on the system. +diff --git a/locale/Makefile b/locale/Makefile +index d7036b08..b5125166 100644 +--- a/locale/Makefile ++++ b/locale/Makefile +@@ -94,7 +94,9 @@ localepath = "$(complocaledir):$(i18ndir)" + # -Iprograms doesn't really belong here, but this gets it at the head + # of the list instead of the tail, where CPPFLAGS-$(lib) gets added. + # We need it before the standard -I's to see programs/config.h first. ++# Define 'LOCALEDIR' for use in 'compute_locale_search_path'. + locale-CPPFLAGS = -DCOMPLOCALEDIR='"$(complocaledir)"' \ ++ -DLOCALEDIR='"$(libdir)/locale"' \ + -DLOCALE_ALIAS_PATH='"$(localedir)"' \ + -Iprograms + diff --git a/locale/newlocale.c b/locale/newlocale.c index 108d2428..6218e0fa 100644 --- a/locale/newlocale.c @@ -56,7 +70,7 @@ diff --git a/locale/setlocale.c b/locale/setlocale.c index 6a902faa..2d07a644 100644 --- a/locale/setlocale.c +++ b/locale/setlocale.c -@@ -213,12 +213,65 @@ setdata (int category, struct __locale_data *data) +@@ -213,12 +213,71 @@ setdata (int category, struct __locale_data *data) } } @@ -104,6 +118,12 @@ index 6a902faa..2d07a644 100644 + goto bail_out; + } + ++ /* Last, unconditionally append our own locale directory, which should ++ contain data for C.UTF-8. */ ++ if (__argz_add_sep (locale_path, locale_path_len, ++ LOCALEDIR "/" VERSION, ':') != 0) ++ goto bail_out; ++ + return 0; + + bail_out: -- 2.41.0