From b62d59cf5cc9f968bedd8126f587bc8e14f7964c Mon Sep 17 00:00:00 2001 Message-ID: In-Reply-To: <3d399e51104171ad328bea66ebdc1d6b0ac99685.1730803153.git.janneke@gnu.org> References: <3d399e51104171ad328bea66ebdc1d6b0ac99685.1730803153.git.janneke@gnu.org> From: Janneke Nieuwenhuizen Date: Mon, 4 Nov 2024 17:38:46 +0100 Subject: [PATCH 3/3] squash! guile: Silence GC warnings on the Hurd. Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Change-Id: Ia720221ed285d3e56938cfa37989d2c7c07b00e3 --- gnu/packages/aux-files/guile-launcher.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/gnu/packages/aux-files/guile-launcher.c b/gnu/packages/aux-files/guile-launcher.c index bc7fa21b63..ee6da76cc4 100644 --- a/gnu/packages/aux-files/guile-launcher.c +++ b/gnu/packages/aux-files/guile-launcher.c @@ -75,19 +75,22 @@ inner_main (void *unused, int argc, char **argv) int main (int argc, char **argv) { - /* Try to install the current locale; remain silent if it fails. */ - if (setlocale (LC_ALL, "") == NULL) - /* The 'guix pull'-provided 'guix' includes at least en_US.utf8 so use - that. That gives us UTF-8 support for 'scm_to_locale_string', etc., - which is always preferable over the C locale. */ - setlocale (LC_ALL, "en_US.utf8"); - #if defined __GNU__ + /* Try to install the C locale; remain silent if it fails. */ + setlocale (LC_ALL, "C"); + /* XXX: On 32-bit GNU/Hurd (i586-gnu), libgc emits "Repeated allocation" warnings that are annoying and interfere with communications between 'guix-daemon' and 'guix authenticate': . Silence them. */ GC_set_warn_proc (no_warnings); +#else + /* Try to install the current locale; remain silent if it fails. */ + if (setlocale (LC_ALL, "") == NULL) + /* The 'guix pull'-provided 'guix' includes at least en_US.utf8 so use + that. That gives us UTF-8 support for 'scm_to_locale_string', etc., + which is always preferable over the C locale. */ + setlocale (LC_ALL, "en_US.utf8"); #endif const char *str; -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com