bug-ungetwc2 can't find locale

[Wolfram Gloger]

Hi,

For a while, "make check" has failed for me with:

GCONV_PATH=/home/wg/glibc/BUILD/iconvdata LC_ALL=C LOCPATH=/home/wg/glibc/BUILD/
localedata  /home/wg/glibc/BUILD/elf/ld-linux.so.2 --library-path /home/wg/glibc
/BUILD:/home/wg/glibc/BUILD/math:/home/wg/glibc/BUILD/elf:/home/wg/glibc/BUILD/d
lfcn:/home/wg/glibc/BUILD/nss:/home/wg/glibc/BUILD/nis:/home/wg/glibc/BUILD/rt:/
home/wg/glibc/BUILD/resolv:/home/wg/glibc/BUILD/crypt:/home/wg/glibc/BUILD/linux
threads /home/wg/glibc/BUILD/libio/bug-ungetwc2  > /home/wg/glibc/BUILD/libio/bu
g-ungetwc2.out
Cannot use `en_US.UTF-8' locale.
make[2]: *** [/home/wg/glibc/BUILD/libio/bug-ungetwc2.out] Error 1
make[2]: Leaving directory `/home/wg/glibc/libc/libio'

(I've got glibc-2.2.5 and no locales installed.)  I think the
following fixes it.

Regards,
Wolfram.

2002-04-22  Wolfram Gloger  <wmglo@dent.med.uni-muenchen.de>

	* libio/Makefile: add LOCPATH to environment for bug-ungetwc[12].

--- libio/Makefile.orig	Fri Apr  5 12:31:24 2002
+++ libio/Makefile	Mon Apr 22 13:12:47 2002
@@ -88,6 +88,8 @@
 tst-ungetwc1-ENV = LOCPATH=$(common-objpfx)localedata
 tst-ungetwc2-ENV = LOCPATH=$(common-objpfx)localedata
 tst-swscanf-ENV = LOCPATH=$(common-objpfx)localedata
+bug-ungetwc1-ENV = LOCPATH=$(common-objpfx)localedata
+bug-ungetwc2-ENV = LOCPATH=$(common-objpfx)localedata
 
 generated = tst-fopenloc.mtrace tst-fopenloc.check
 
2002-04-22  Wolfram Gloger  <wmglo@dent.med.uni-muenchen.de>

	* Makefile: Add en_US.UTF-8 to LOCALES.

--- localedata/Makefile.orig	Sat Aug 18 04:46:01 2001
+++ localedata/Makefile	Mon Apr 22 15:41:08 2002
@@ -128,7 +128,7 @@
 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
 LOCALE_SRCS := $(shell echo "$(LOCALES)"|sed 's/\([^ .]*\)[^ ]*/\1/g')
 CHARMAPS := $(shell echo "$(LOCALES)" | \