01/01: gnu: glibc-locales: Fix build.

[???]

iyzsong pushed a commit to branch core-updates
in repository guix.

commit 85860fdf82f75c2026d8b93aac14ad34feea3d87
Author: 宋文武 <address@hidden>
Date:   Sun Jul 31 10:42:47 2016 +0800

    gnu: glibc-locales: Fix build.
    
    * gnu/packages/patches/glibc-locales.patch: Adjust to glibc-2.23.
    * gnu/packages/base.scm (glibc-locales)[arguments]:
    Pass 'lib_cv_complocaledir'.
---
 gnu/packages/base.scm                    |    2 +-
 gnu/packages/patches/glibc-locales.patch |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 3135108..5edf3eb 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -786,7 +786,7 @@ the 'share/locale' sub-directory of this package.")
          ((#:configure-flags flags)
           `(append ,flags
                    ;; Use $(libdir)/locale/X.Y as is the case by default.
-                   (list (string-append "libc_cv_localedir="
+                   (list (string-append "libc_cv_complocaledir="
                                         (assoc-ref %outputs "out")
                                         "/lib/locale/"
                                         ,(package-version glibc))))))))))
diff --git a/gnu/packages/patches/glibc-locales.patch 
b/gnu/packages/patches/glibc-locales.patch
index 1bcf12b..3a125e8 100644
--- a/gnu/packages/patches/glibc-locales.patch
+++ b/gnu/packages/patches/glibc-locales.patch
@@ -5,8 +5,8 @@ in a package separate from glibc.
   2. Use '--no-archive' to avoid building the big locale archive, and
      because the already-built 'localedef' would want to write it
      to '/run/current-system/locale', which is not possible.
-  3. Pass $(localedir)/$$locale to install files in the right place, and
-     because otherwise, 'localedef' fails with:
+  3. Pass $(inst_complocaledir)/$$locale to install files in the right
+     place, and because otherwise, 'localedef' fails with:
      "cannot write output files to `(null)'".
 
 --- glibc-2.22/localedata/Makefile     1970-01-01 01:00:00.000000000 +0100
@@ -25,7 +25,7 @@ in a package separate from glibc.
        $(LOCALEDEF) --alias-file=../intl/locale.alias \
                     -i locales/$$input -c -f charmaps/$$charset \
 -                   $(addprefix --prefix=,$(install_root)) $$locale \
-+                   $(addprefix --prefix=,$(install_root)) 
$(localedir)/$$locale \
++                   $(addprefix --prefix=,$(install_root)) 
$(inst_complocaledir)/$$locale \
        && echo ' done'; \
  
  tst-setlocale-ENV = LC_ALL=ja_JP.EUC-JP