01/01: gnu: glibc-locales: Adjust patch that no longer applied.

[Ludovic Courtès]

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

commit 9ab0627eee328b03f8014e409d9682c8e295afe2
Author: Ludovic Courtès <address@hidden>
Date:   Wed May 30 15:21:27 2018 +0200

    gnu: glibc-locales: Adjust patch that no longer applied.
    
    * gnu/packages/patches/glibc-locales.patch: Adjust for glibc 2.27.
---
 gnu/packages/patches/glibc-locales.patch | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/patches/glibc-locales.patch 
b/gnu/packages/patches/glibc-locales.patch
index 3a125e8..31ee6c1 100644
--- a/gnu/packages/patches/glibc-locales.patch
+++ b/gnu/packages/patches/glibc-locales.patch
@@ -9,9 +9,9 @@ in a package separate from glibc.
      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
-+++ glibc-2.22/localedata/Makefile     2015-09-25 14:18:34.698941752 +0200
-@@ -195,7 +195,7 @@ INSTALL-SUPPORTED-LOCALES=$(addprefix in
+--- glibc-2.27/localedata/Makefile
++++ glibc-2.27/localedata/Makefile
+@@ -199,7 +199,7 @@ INSTALL-SUPPORTED-LOCALES=$(addprefix install-, 
$(SUPPORTED-LOCALES))
  
  # Sometimes the whole collection of locale files should be installed.
  LOCALEDEF=I18NPATH=. GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
@@ -20,10 +20,10 @@ in a package separate from glibc.
  install-locales: $(INSTALL-SUPPORTED-LOCALES)
  
  install-locales-dir:
-@@ -212,7 +212,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
+@@ -224,7 +224,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
        input=`echo $$locale | sed 's/\([^.]*\)address@hidden(.*\)/\1\2/'`; \
-       $(LOCALEDEF) --alias-file=../intl/locale.alias \
-                    -i locales/$$input -c -f charmaps/$$charset \
+       $(LOCALEDEF) $$flags --alias-file=../intl/locale.alias \
+                    -i locales/$$input -f charmaps/$$charset \
 -                   $(addprefix --prefix=,$(install_root)) $$locale \
 +                   $(addprefix --prefix=,$(install_root)) 
$(inst_complocaledir)/$$locale \
        && echo ' done'; \