public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Making glibc-2.11.1 search the locale archive not in LOCALE_ARCHIVE, but LOCALE_ARCHIVE_2_11

Browse Source 
Then, next updates of glibc versions should involve also a change in the LOCALE_ARCHIVE_X_XX variable name, and this way nixos would deal properly with locales and old-glibc packages.

I welcome other solutions. This looks simple enough, so that's why I go on it.


svn path=/nixpkgs/branches/stdenv-updates/; revision=20944
This commit is contained in:
Lluís Batlle i Rossell 2010-04-04 18:05:58 +00:00
parent c7bc635983
commit 2d261d1c1e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/glibc-2.11/locale-override.patch
View File

@ -11,7 +11,7 @@ diff -rc glibc-2.9-20081208-orig/locale/loadarchive.c glibc-2.9-20081208/locale/
+ open_locale_archive () + open_locale_archive ()
+ { + {
+ int fd = -1; + int fd = -1;
+ char *path = getenv ("LOCALE_ARCHIVE"); + char *path = getenv ("LOCALE_ARCHIVE_2_11");
+ if (path) + if (path)
+ fd = open_not_cancel_2 (path, O_RDONLY|O_LARGEFILE); + fd = open_not_cancel_2 (path, O_RDONLY|O_LARGEFILE);
+ if (fd < 0) + if (fd < 0)
@ -66,7 +66,7 @@ diff -rc glibc-2.9-20081208-orig/sysdeps/generic/unsecvars.h glibc-2.9-20081208/
"LD_SHOW_AUXV\0" \ "LD_SHOW_AUXV\0" \
"LD_USE_LOAD_BIAS\0" \ "LD_USE_LOAD_BIAS\0" \
"LOCALDOMAIN\0" \ "LOCALDOMAIN\0" \
+ "LOCALE_ARCHIVE\0" \ + "LOCALE_ARCHIVE_2_11\0" \
"LOCPATH\0" \ "LOCPATH\0" \
"MALLOC_TRACE\0" \ "MALLOC_TRACE\0" \
"NIS_PATH\0" \ "NIS_PATH\0" \