diff options
| author | Kei Kebreau <kkebreau@posteo.net> | 2019-07-04 06:49:29 -0400 |
|---|---|---|
| committer | Kei Kebreau <kkebreau@posteo.net> | 2019-07-09 12:15:52 -0400 |
| commit | d4137d84ac75edaf2739578d0868cd77dd6da43c (patch) | |
| tree | ec389b86ea454880ba4494c97691314018a23c3a /gnu/packages/patches/glibc-locales.patch | |
| parent | ca3757e1c2fdc1576d17239a57f0a493a47bc6dc (diff) | |
| download | guix-d4137d84ac75edaf2739578d0868cd77dd6da43c.tar.gz | |
gnu: make-glibc-locales: Adjust patch for glibc 2.29.
The patch for glibc 2.28 and earlier replaces the same content, but the context in the patch is different enough to fail to merge. * gnu/packages/base.scm (make-glibc-locales)[source]: Add patch. * gnu/packages/patches/glibc-locales.patch: Adjust for glibc 2.29 and move old file... * gnu/packages/patches/glibc-locales-2.28.patch: ...here. * gnu/local.mk (dist_patch_DATA): Add it.
Diffstat (limited to 'gnu/packages/patches/glibc-locales.patch')
| -rw-r--r-- | gnu/packages/patches/glibc-locales.patch | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/gnu/packages/patches/glibc-locales.patch b/gnu/packages/patches/glibc-locales.patch index 31ee6c1ff3..9329a09063 100644 --- a/gnu/packages/patches/glibc-locales.patch +++ b/gnu/packages/patches/glibc-locales.patch @@ -9,23 +9,24 @@ in a package separate from glibc. place, and because otherwise, 'localedef' fails with: "cannot write output files to `(null)'". ---- glibc-2.27/localedata/Makefile -+++ glibc-2.27/localedata/Makefile -@@ -199,7 +199,7 @@ INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES)) +diff -ru glibc-2.29-old/localedata/Makefile glibc-2.29-new/localedata/Makefile +--- glibc-2.29-old/localedata/Makefile 2019-01-31 11:45:36.000000000 -0500 ++++ glibc-2.29-new/localedata/Makefile 2019-07-03 22:48:35.662015071 -0400 +@@ -385,7 +385,7 @@ # Sometimes the whole collection of locale files should be installed. LOCALEDEF=I18NPATH=. GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \ -$(rtld-prefix) $(common-objpfx)locale/localedef + localedef --no-archive - install-locales: $(INSTALL-SUPPORTED-LOCALES) + install-locales: install-locale-archive - install-locales-dir: -@@ -224,7 +224,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir + # Create and install the locale-archive file. +@@ -414,7 +414,7 @@ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ $(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'; \ + && echo ' done'; + endef - tst-setlocale-ENV = LC_ALL=ja_JP.EUC-JP |