From mboxrd@z Thu Jan 1 00:00:00 1970 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: Re: core-updates merged! Date: Tue, 02 Aug 2016 23:28:59 +0200 Message-ID: <874m7297xg.fsf@gnu.org> References: <20160801081958.GA2211@solar> <87lh0ggnyt.fsf@gnu.org> <87invje1yx.fsf@we.make.ritual.n0.is> <87invj84bc.fsf@gnu.org> <20160802174821.GA29590@jasmine> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:49068) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUhFL-0008PA-FD for guix-devel@gnu.org; Tue, 02 Aug 2016 17:29:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bUhFI-0001iz-1Y for guix-devel@gnu.org; Tue, 02 Aug 2016 17:29:07 -0400 In-Reply-To: <20160802174821.GA29590@jasmine> (Leo Famulari's message of "Tue, 2 Aug 2016 13:48:21 -0400") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Leo Famulari Cc: guix-devel@gnu.org Leo Famulari skribis: > On Tue, Aug 02, 2016 at 07:32:23PM +0200, Ludovic Court=C3=A8s 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/90fe682d3067163aa773feecf497ef59942945= 7a > > 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'. Good catch! > 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 . > - ;; FIXME: This hack no longer works on 2.23! > - (string-append "libc_cv_localedir=3D/run/current-system/loca= le/" > + (string-append "libc_cv_complocaledir=3D/run/current-system/= locale/" > ,version) >=20=20 > (string-append "--with-headers=3D" > 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~%") >=20=20 > ;; By default, applications that use D-Bus, such as Emacs, abort at = startup > ;; when /etc/machine-id is missing. Make sure these warnings are no= n-fatal. > - ("DBUS_FATAL_WARNINGS" . "0") > - > - ;; XXX: Normally we wouldn't need to do this, but our glibc@2.23 pac= kage > - ;; 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"))) >=20=20 > (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)) >=20=20 > - (test-equal "locale" > - "en_US.utf8" > - (marionette-eval '(begin > - ;; XXX: This 'setenv' call wouldn't be n= eeded > - ;; 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.u= tf8"))) > - (setlocale LC_ALL before))) > - marionette)) Here we should keep the test, but remove =E2=80=98setenv=E2=80=99: (marionette-eval '(let ((before (setlocale LC_ALL "en_US.utf8"))) (setlocale LC_ALL before)) marionette) That will catch this regression in the future. Otherwise LGTM; could you push it to core-updates-next? Thank you for the fast investigation! Ludo=E2=80=99.