[commits] r6171 - in /branches/eglibc-2_8/libc: ChangeLog.eglibc iconvdata/Makefile localedata/Makefile

[joseph@xxxxxxxxxx]

Author: joseph
Date: Wed May 14 17:13:57 2008
New Revision: 6171

Log:
	* iconvdata/Makefile (bug-iconv6-ENV, tst-iconv7-ENV): Define.
	* localedata/Makefile (LOCALES): Add en_US.UTF-8.

Modified:
    branches/eglibc-2_8/libc/ChangeLog.eglibc
    branches/eglibc-2_8/libc/iconvdata/Makefile
    branches/eglibc-2_8/libc/localedata/Makefile

Modified: branches/eglibc-2_8/libc/ChangeLog.eglibc
==============================================================================
--- branches/eglibc-2_8/libc/ChangeLog.eglibc (original)
+++ branches/eglibc-2_8/libc/ChangeLog.eglibc Wed May 14 17:13:57 2008
@@ -1,3 +1,8 @@
+2008-05-14  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* iconvdata/Makefile (bug-iconv6-ENV, tst-iconv7-ENV): Define.
+	* localedata/Makefile (LOCALES): Add en_US.UTF-8.
+
 2008-05-14  Maxim Kuvyrkov  <maxim@xxxxxxxxxxxxxxxx>
 
 	Backport from trunk:

Modified: branches/eglibc-2_8/libc/iconvdata/Makefile
==============================================================================
--- branches/eglibc-2_8/libc/iconvdata/Makefile (original)
+++ branches/eglibc-2_8/libc/iconvdata/Makefile Wed May 14 17:13:57 2008
@@ -74,6 +74,9 @@
 ifeq ($(have-thread-library),yes)
 tests += bug-iconv3
 endif
+
+bug-iconv6-ENV = LOCPATH=$(common-objpfx)localedata
+tst-iconv7-ENV = LOCPATH=$(common-objpfx)localedata
 
 test-srcs := tst-table-from tst-table-to
 endif

Modified: branches/eglibc-2_8/libc/localedata/Makefile
==============================================================================
--- branches/eglibc-2_8/libc/localedata/Makefile (original)
+++ branches/eglibc-2_8/libc/localedata/Makefile Wed May 14 17:13:57 2008
@@ -145,7 +145,7 @@
 # eglibc: ifeq (no,$(cross-compiling))
 # We have to generate locales
 LOCALES := de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ANSI_X3.4-1968 \
-	   en_US.ISO-8859-1 ja_JP.EUC-JP da_DK.ISO-8859-1 \
+	   en_US.ISO-8859-1 en_US.UTF-8 ja_JP.EUC-JP da_DK.ISO-8859-1 \
 	   hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 ja_JP.SJIS fr_FR.ISO-8859-1 \
 	   vi_VN.TCVN5712-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 \