diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-10-12 21:42:06 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-10-12 21:42:06 +0200 |
| commit | adc90e0eac3cb326cd687f80514dad6a5240969d (patch) | |
| tree | 6335b4b8cded5dc1518b5494762cdb09d8acbab1 /gnu/packages/patches/glibc-locale-incompatibility.patch | |
| parent | a8bc747ae1ba53c4c8719730284a771187d8ccfb (diff) | |
| parent | 9765b3aeac88ae9c9ffc38ed6d1f8dcbd9abca7b (diff) | |
| download | guix-adc90e0eac3cb326cd687f80514dad6a5240969d.tar guix-adc90e0eac3cb326cd687f80514dad6a5240969d.tar.gz | |
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/patches/glibc-locale-incompatibility.patch')
| -rw-r--r-- | gnu/packages/patches/glibc-locale-incompatibility.patch | 23 |
1 files changed, 23 insertions, 0 deletions
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); |