diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-08-04 08:16:38 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-08-04 08:16:38 -0400 |
| commit | 0832787e5c463c713d8f24fdec0f52900ff1c2bd (patch) | |
| tree | 5ce20bef711d0d85a22cd041758278d7c176b0f3 /gnu/packages/patches/glibc-locales.patch | |
| parent | 5b098cc4b937c05d6f685772c66e2aa04490710a (diff) | |
Revert "Merge branch 'core-updates'"
This reverts commit 455859a50f88f625d13fc2f304111f02369b366b.
Diffstat (limited to 'gnu/packages/patches/glibc-locales.patch')
| -rw-r--r-- | gnu/packages/patches/glibc-locales.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/patches/glibc-locales.patch b/gnu/packages/patches/glibc-locales.patch index 3a125e845e..1bcf12bf6f 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 $(inst_complocaledir)/$$locale to install files in the right - place, and because otherwise, 'localedef' fails with: + 3. Pass $(localedir)/$$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)) $(inst_complocaledir)/$$locale \ ++ $(addprefix --prefix=,$(install_root)) $(localedir)/$$locale \ && echo ' done'; \ tst-setlocale-ENV = LC_ALL=ja_JP.EUC-JP |