diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-10-08 11:23:22 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-10-08 11:37:07 +0200 |
| commit | cf3d1763ede1a329c2bc932c84591ab594bb6c96 (patch) | |
| tree | 665f92418f8671474de3815241fb657384463c94 /gnu/packages/patches/glibc-locales-2.28.patch | |
| parent | d57660c54907cc6fba8b0adf6295fd2311ada6cf (diff) | |
| parent | 2fa55c72476c73211cbb2d6b29c05a1ad58a6cf9 (diff) | |
| download | guix-cf3d1763ede1a329c2bc932c84591ab594bb6c96.tar.gz | |
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/patches/glibc-locales-2.28.patch')
| -rw-r--r-- | gnu/packages/patches/glibc-locales-2.28.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/gnu/packages/patches/glibc-locales-2.28.patch b/gnu/packages/patches/glibc-locales-2.28.patch new file mode 100644 index 0000000000..31ee6c1ff3 --- /dev/null +++ b/gnu/packages/patches/glibc-locales-2.28.patch @@ -0,0 +1,31 @@ +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 $(inst_complocaledir)/$$locale to install files in the right + 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)) + + # 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: +@@ -224,7 +224,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir + 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'; \ + + tst-setlocale-ENV = LC_ALL=ja_JP.EUC-JP |