nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

* gnu/packages/patches/glibc-locales.patch: Adjust for glibc 2.27.
This commit is contained in:
Ludovic Courtès 2018-05-30 15:21:27 +02:00
parent 80c0f69c50
commit 9ab0627eee
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/patches/glibc-locales.patch
View File

@ -9,9 +9,9 @@ in a package separate from glibc.
place, and because otherwise, 'localedef' fails with: place, and because otherwise, 'localedef' fails with:
"cannot write output files to `(null)'". "cannot write output files to `(null)'".
--- glibc-2.22/localedata/Makefile 1970-01-01 01:00:00.000000000 +0100 --- glibc-2.27/localedata/Makefile
+++ glibc-2.22/localedata/Makefile 2015-09-25 14:18:34.698941752 +0200 +++ glibc-2.27/localedata/Makefile
@@ -195,7 +195,7 @@ INSTALL-SUPPORTED-LOCALES=$(addprefix in @@ -199,7 +199,7 @@ INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES))
# Sometimes the whole collection of locale files should be installed. # Sometimes the whole collection of locale files should be installed.
LOCALEDEF=I18NPATH=. GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \ 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: $(INSTALL-SUPPORTED-LOCALES)
install-locales-dir: 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/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
$(LOCALEDEF) --alias-file=../intl/locale.alias \ $(LOCALEDEF) $$flags --alias-file=../intl/locale.alias \
-i locales/$$input -c -f charmaps/$$charset \ -i locales/$$input -f charmaps/$$charset \
- $(addprefix --prefix=,$(install_root)) $$locale \ - $(addprefix --prefix=,$(install_root)) $$locale \
+ $(addprefix --prefix=,$(install_root)) $(inst_complocaledir)/$$locale \ + $(addprefix --prefix=,$(install_root)) $(inst_complocaledir)/$$locale \
&& echo ' done'; \ && echo ' done'; \