e2aace769c
* gnu/packages/base.scm (glibc-locales)[arguments]: Remove 'delete-file-recursively' call from 'build' phase. * gnu/packages/patches/glibc-locales.patch: Adjust to glibc 2.22.
32 lines
1.4 KiB
Diff
32 lines
1.4 KiB
Diff
This patch allows us to use glibc's build system to build locales
|
|
in a package separate from glibc.
|
|
|
|
1. Use 'localedef' from $PATH since we are not rebuilding it.
|
|
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:
|
|
"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
|
|
|
|
# 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-dir:
|
|
@@ -212,7 +212,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
|
|
input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
|
|
$(LOCALEDEF) --alias-file=../intl/locale.alias \
|
|
-i locales/$$input -c -f charmaps/$$charset \
|
|
- $(addprefix --prefix=,$(install_root)) $$locale \
|
|
+ $(addprefix --prefix=,$(install_root)) $(localedir)/$$locale \
|
|
&& echo ' done'; \
|
|
|
|
tst-setlocale-ENV = LC_ALL=ja_JP.EUC-JP
|