[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/10: gnu: glibc/linux: Adjust variable name to upstream change.
From: |
Leo Famulari |
Subject: |
10/10: gnu: glibc/linux: Adjust variable name to upstream change. |
Date: |
Wed, 10 Aug 2016 19:41:42 +0000 (UTC) |
lfam pushed a commit to branch WIP-core-updates
in repository guix.
commit 9f58fe3d1c32e3f0ced065e286532a10cad1b5e3
Author: Leo Famulari <address@hidden>
Date: Tue Aug 2 22:24:02 2016 -0400
gnu: glibc/linux: Adjust variable name to upstream change.
* gnu/packages/base.scm (glibc/linux)[arguments]: Change
'libc_cv_localedir' to 'libc_cv_complocaledir' in #:configure-flags.
* gnu/system.scm: (operating-system-environment-variables): Remove
'GUIX_LOCPATH'.
---
gnu/packages/base.scm | 5 ++---
gnu/system.scm | 7 +------
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index a476837..4d5ab4b 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -527,7 +527,7 @@ store.")
;; Set the default locale path. In practice, $LOCPATH may be
;; defined to point whatever locales users want. However, setuid
;; binaries don't honor $LOCPATH, so they'll instead look into
- ;; $libc_cv_localedir; we choose /run/current-system/locale/X.Y,
+ ;; $libc_cv_complocaledir; we choose
/run/current-system/locale/X.Y,
;; with the idea that it is going to be populated by the sysadmin.
;; The "X.Y" sub-directory is because locale data formats are
;; incompatible across libc versions; see
@@ -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 address@hidden
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.
- branch WIP-core-updates updated (dd05e73 -> 9f58fe3), Leo Famulari, 2016/08/10
- 01/10: packages: Use '--no-backup-if-mismatch' for patching., Leo Famulari, 2016/08/10
- 03/10: utils: Fix 'modify-phases' docstring., Leo Famulari, 2016/08/10
- 02/10: gnu: curl: Update to 7.50.1., Leo Famulari, 2016/08/10
- 06/10: build: Correctly determine the system type for GNU/Hurd systems., Leo Famulari, 2016/08/10
- 04/10: gnu: sqlite: Update to 3.13.0., Leo Famulari, 2016/08/10
- 07/10: gnu: guile: Use "site-ccache" for the compiled search path., Leo Famulari, 2016/08/10
- 09/10: gnu: cross-libc: Cross build the correct libc for GNU/Hurd systems., Leo Famulari, 2016/08/10
- 08/10: gnu: commencement: Add support for a native GNU/Hurd system., Leo Famulari, 2016/08/10
- 05/10: gnu: wrap-python3: Create more symlinks., Leo Famulari, 2016/08/10
- 10/10: gnu: glibc/linux: Adjust variable name to upstream change.,
Leo Famulari <=