diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-10-03 12:19:23 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-10-03 14:36:07 +0200 |
| commit | 2ae71b746bd7265735cb50b2dd93a09ef45f9f38 (patch) | |
| tree | c21d45750c08601e24ba09744ed51410e8cb2aed /gnu | |
| parent | 997f86e96b003462751e4bde4397aec34090dc48 (diff) | |
| download | guix-2ae71b746bd7265735cb50b2dd93a09ef45f9f38.tar.gz | |
gnu: glibc: Do not abort when incompatible locale data is found.
* gnu/packages/patches/glibc-locale-incompatibility.patch: New file. * gnu/packages/base.scm (glibc)[source]: Use it. * gnu-system.am (dist_patch_DATA): Add it.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/base.scm | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/glibc-locale-incompatibility.patch | 23 |
2 files changed, 24 insertions, 0 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index a7d9459913..99f60d1400 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -476,6 +476,7 @@ store.") (modules '((guix build utils))) (patches (map search-patch '("glibc-ldd-x86_64.patch" + "glibc-locale-incompatibility.patch" "glibc-o-largefile.patch"))))) (build-system gnu-build-system) diff --git a/gnu/packages/patches/glibc-locale-incompatibility.patch b/gnu/packages/patches/glibc-locale-incompatibility.patch new file mode 100644 index 0000000000..baf30a79a7 --- /dev/null +++ b/gnu/packages/patches/glibc-locale-incompatibility.patch @@ -0,0 +1,23 @@ +This patch avoids an assertion failure when incompatible locale data +is encountered: + + https://sourceware.org/ml/libc-alpha/2015-09/msg00575.html + +--- glibc-2.22/locale/loadlocale.c 2015-09-22 17:16:02.321981548 +0200 ++++ glibc-2.22/locale/loadlocale.c 2015-09-22 17:17:34.814659064 +0200 +@@ -120,10 +120,11 @@ + _nl_value_type_LC_XYZ array. There are all pointers. */ + switch (category) + { +-#define CATTEST(cat) \ +- case LC_##cat: \ +- assert (cnt < (sizeof (_nl_value_type_LC_##cat) \ +- / sizeof (_nl_value_type_LC_##cat[0]))); \ ++#define CATTEST(cat) \ ++ case LC_##cat: \ ++ if (cnt >= (sizeof (_nl_value_type_LC_##cat) \ ++ / sizeof (_nl_value_type_LC_##cat[0]))) \ ++ goto puntdata; \ + break + CATTEST (NUMERIC); + CATTEST (TIME); |