all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Leo Famulari <leo@famulari.name>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: guix-devel@gnu.org
Subject: Re: core-updates merged!
Date: Tue, 2 Aug 2016 13:48:21 -0400	[thread overview]
Message-ID: <20160802174821.GA29590@jasmine> (raw)
In-Reply-To: <87invj84bc.fsf@gnu.org>

On Tue, Aug 02, 2016 at 07:32:23PM +0200, Ludovic Courtès wrote:
> As discussed on IRC, SNAFU!  For reasons yet to be elucidated, the
> glibc@2.23 package no longer honors /run/current-system/locale.

I believe that this commit in glibc@2.23 is the culprit:

http://repo.or.cz/glibc.git/commit/90fe682d3067163aa773feecf497ef599429457a

The variable 'libc_cv_localedir', which we set as
"/run/current-system/locale/" in the glibc/linux package definition, has
been renamed to 'libc_cv_complocaledir'.

Should it be enough to make the following change? This reverts ab3a6450
(system: Define 'GUIX_LOCPATH' to work around 'glibc' package defect.)
and changes the name of the variable.

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index a476837..bb1879a 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -535,8 +535,7 @@ store.")
             ;;
             ;; `--localedir' is not honored, so work around it.
             ;; See <http://sourceware.org/ml/libc-alpha/2013-03/msg00093.html>.
-            ;; FIXME: This hack no longer works on 2.23!
-            (string-append "libc_cv_localedir=/run/current-system/locale/"
+            (string-append "libc_cv_complocaledir=/run/current-system/locale/"
                            ,version)
 
             (string-append "--with-headers="
diff --git a/gnu/system.scm b/gnu/system.scm
index d6bf6c4..04dd7a8 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -545,12 +545,7 @@ use 'plain-file' instead~%")
 
     ;; By default, applications that use D-Bus, such as Emacs, abort at startup
     ;; when /etc/machine-id is missing.  Make sure these warnings are non-fatal.
-    ("DBUS_FATAL_WARNINGS" . "0")
-
-    ;; XXX: Normally we wouldn't need to do this, but our glibc@2.23 package
-    ;; looks things up in 'PREFIX/lib/locale' instead of
-    ;; '/run/current-system/locale' as was intended.
-    ("GUIX_LOCPATH" . "/run/current-system/locale")))
+    ("DBUS_FATAL_WARNINGS" . "0")))
 
 (define %setuid-programs
   ;; Default set of setuid-root programs.
diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm
index 7170ab1..a6278b2 100644
--- a/gnu/tests/base.scm
+++ b/gnu/tests/base.scm
@@ -178,18 +178,6 @@ info --version")
              '(false-if-exception (getaddrinfo "does-not-exist"))
              marionette))
 
-          (test-equal "locale"
-            "en_US.utf8"
-            (marionette-eval '(begin
-                                ;; XXX: This 'setenv' call wouldn't be needed
-                                ;; but our glibc@2.23 currently ignores
-                                ;; /run/current-system/locale.
-                                (setenv "GUIX_LOCPATH"
-                                        "/run/current-system/locale")
-                                (let ((before (setlocale LC_ALL "en_US.utf8")))
-                                  (setlocale LC_ALL before)))
-                             marionette))
-
           (test-assert "screendump"
             (begin
               (marionette-control (string-append "screendump " #$output

  reply	other threads:[~2016-08-02 17:48 UTC|newest]

Thread overview: 64+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-01  8:19 Core-updates Andreas Enge
2016-08-01 21:48 ` core-updates merged! Ludovic Courtès
2016-08-02 13:26   ` ng0
2016-08-02 17:32     ` Ludovic Courtès
2016-08-02 17:48       ` Leo Famulari [this message]
2016-08-02 21:28         ` Ludovic Courtès
2016-08-03  4:04           ` Leo Famulari
2016-08-03 16:42             ` Ludovic Courtès
2016-08-03 17:24               ` Leo Famulari
2016-08-03 17:56                 ` Ludovic Courtès
2016-08-03 18:39                   ` Leo Famulari
2016-08-03 20:01                     ` Ludovic Courtès
2016-08-03 21:01                       ` Leo Famulari
2016-08-03 21:27                         ` Andreas Enge
2016-08-03 22:14                           ` Leo Famulari
2016-08-03 20:29                     ` ‘core-updates’ merge is a squashed commit Ludovic Courtès
2016-08-03 21:10                       ` Leo Famulari
2016-08-04  7:50                         ` Mark H Weaver
2016-08-04  8:24                           ` Andreas Enge
2016-08-04 12:36                             ` Mark H Weaver
2016-08-04 12:40                               ` Andreas Enge
2016-08-04 13:04                                 ` Leo Famulari
2016-08-04 13:23                                   ` Mark H Weaver
2016-08-04 14:07                                     ` Ludovic Courtès
2016-08-04 14:10                                     ` Andreas Enge
2016-08-04 14:45                                       ` Mathieu Lirzin
2016-08-04 16:37                                         ` Leo Famulari
2016-08-04 18:32                                           ` Andreas Enge
2016-08-04 20:06                                             ` Leo Famulari
2016-08-04 18:34                                         ` Andreas Enge
2016-08-04 15:06                               ` Andy Wingo
2016-08-04 16:44                                 ` Leo Famulari
2016-08-04 16:55                                   ` Andy Wingo
2016-08-04 20:05                                     ` Leo Famulari
2016-08-05  7:35                                       ` Andy Wingo
2016-08-05 14:59                                         ` Leo Famulari
2016-08-05 16:50                                           ` Andy Wingo
2016-08-05 17:11                                             ` Leo Famulari
2016-08-06  0:59                                               ` Mark H Weaver
2016-08-06  2:07                                                 ` Leo Famulari
2016-08-08  7:38                                                   ` Andy Wingo
2016-08-06  7:52                                                 ` Andreas Enge
2016-08-08  7:46                                                   ` Andy Wingo
2016-08-07  6:16                                 ` Mike Gerwitz
2016-08-04 11:41                           ` Leo Famulari
2016-08-06 14:42             ` core-updates merged! Leo Famulari
2016-08-10 19:49               ` Leo Famulari
2016-08-13  7:15                 ` Manolis Ragkousis
2016-08-13 23:20                   ` Core-updates is ready for your patches! Leo Famulari
2016-08-09  3:07           ` core-updates merged! Leo Famulari
  -- strict thread matches above, loose matches on Subject: below --
2020-05-08 19:47 Marius Bakke
2020-05-08 20:48 ` Jack Hill
2017-08-18 21:24 'core-updates' status Marius Bakke
2017-08-21 21:07 ` Marius Bakke
2017-08-25 18:34   ` Marius Bakke
2017-08-25 19:55     ` Leo Famulari
2017-08-26 12:04       ` Ludovic Courtès
2017-08-26 13:30         ` core-updates merged! Marius Bakke
2017-08-27 16:03           ` Ludovic Courtès
2015-02-10 16:38 Federico Beffa
2015-02-10 18:46 ` Andreas Enge
2015-02-10 18:50   ` John Darrington
2015-02-10 19:38   ` Federico Beffa
2015-01-05 16:51 core-updates, wip-armhf, and 0.8.1 Ludovic Courtès
2015-01-16 12:39 ` core-updates merged! Ludovic Courtès
2014-03-18 14:26 core-updates merge soon! Ludovic Courtès
2014-03-26 15:46 ` core-updates merged! Ludovic Courtès
2014-03-26 15:55   ` Thompson, David
2014-03-26 16:14     ` Ludovic Courtès
2014-03-26 17:28       ` Thompson, David
2014-03-27  9:37         ` Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160802174821.GA29590@jasmine \
    --to=leo@famulari.name \
    --cc=guix-devel@gnu.org \
    --cc=ludo@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.