about summary refs log tree commit diff
diff options
context:
space:
mode:
authorStefan Liebler <stli@linux.vnet.ibm.com>2014-06-20 07:44:42 +0530
committerSiddhesh Poyarekar <siddhesh@redhat.com>2014-06-20 07:44:42 +0530
commitd8c2869d4450d54935c3410ad3093d51b5d85f79 (patch)
treec23fe26c25372b580ff14e60f7fd61f90031435e
parentc8daec5c7cd19378112391d2394e6d6344e156dc (diff)
downloadglibc-d8c2869d4450d54935c3410ad3093d51b5d85f79.tar.gz
glibc-d8c2869d4450d54935c3410ad3093d51b5d85f79.tar.xz
glibc-d8c2869d4450d54935c3410ad3093d51b5d85f79.zip
Generate en_GB.UTF-8 during testing
This patch generates en_GB.UTF-8, which is used in
tst-strcoll-overflow.  This solves the issue of failing xtests on
s390/s390x.
-rw-r--r--ChangeLog4
-rw-r--r--localedata/Makefile2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ec08f77bf1..e2a19339c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-20  Stefan Liebler  <stli@linux.vnet.ibm.com>
+
+	* Makefile (LOCALES): Add en_GB.UTF-8.
+
 2014-06-19  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/x86/nptl/bits/pthreadtypes.h (pthread_rwlock_t): Use
diff --git a/localedata/Makefile b/localedata/Makefile
index 023f443206..e8fe10fbdc 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -105,7 +105,7 @@ LOCALES := de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ANSI_X3.4-1968 \
 	   hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 ja_JP.SJIS fr_FR.ISO-8859-1 \
 	   nb_NO.ISO-8859-1 nn_NO.ISO-8859-1 tr_TR.UTF-8 cs_CZ.UTF-8 \
 	   zh_TW.EUC-TW fa_IR.UTF-8 fr_FR.UTF-8 ja_JP.UTF-8 si_LK.UTF-8 \
-	   tr_TR.ISO-8859-9
+	   tr_TR.ISO-8859-9 en_GB.UTF-8
 LOCALE_SRCS := $(shell echo "$(LOCALES)"|sed 's/\([^ .]*\)[^ ]*/\1/g')
 CHARMAPS := $(shell echo "$(LOCALES)" | \
 		    sed -e 's/[^ .]*[.]\([^ ]*\)/\1/g' -e s/SJIS/SHIFT_JIS/g)