help upgrading to 2.1.2

[John Hoebing <jlh@geodesic.com>]

I have a typical RedHat 6.0 installation, with glibc-2.1.1-6,
and I tried to upgrade with the rawhide glibc-2.1.2*rpm.
The X server broke as did a lot of the binutils, so I went
back to 2.1.1.

Then I tried to compile the latest glibc-2.1.2, and it ended
with the following error:

gcc ../crypt/sysdeps/unix/crypt.c -c -O -Wall -Winline -Wstrict-prototypes -Wwrite-strings
-g      -I../include -I.  -I.. -I../libio  -I../sysdeps/i386/elf -I../crypt/sysdeps/unix
-I../linuxthreads/sysdeps/unix/sysv/linux -I../linuxthreads/sysdeps/pthread
-I../linuxthreads/sysdeps/unix/sysv -I../linuxthreads/sysdeps/unix
-I../linuxthreads/sysdeps/i386/i686 -I../linuxthreads/sysdeps/i386
-I../sysdeps/unix/sysv/linux/i386/i686 -I../sysdeps/unix/sysv/linux/i386
-I../sysdeps/unix/sysv/linux -I../sysdeps/gnu -I../sysdeps/unix/common
-I../sysdeps/unix/mman -I../sysdeps/unix/inet -I../sysdeps/unix/sysv/i386
-I../sysdeps/unix/sysv -I../sysdeps/unix/i386 -I../sysdeps/unix -I../sysdeps/posix
-I../sysdeps/i386/i686 -I../sysdeps/i386/i486 -I../sysdeps/libm-i387/i686
-I../sysdeps/i386/fpu -I../sysdeps/libm-i387 -I../sysdeps/i386 -I../sysdeps/wordsize-32
-I../sysdeps/ieee754 -I../sysdeps/libm-ieee754 -I../sysdeps/generic/elf
-I../sysdeps/generic   -D_LIBC_REENTRANT -include ../include/libc-symbols.h     -o crypt.o

gcc ../crypt/sysdeps/unix/crypt_util.c -c -O -Wall -Winline -Wstrict-prototypes
-Wwrite-strings -g      -I../include -I.  -I.. -I../libio  -I../sysdeps/i386/elf
-I../crypt/sysdeps/unix -I../linuxthreads/sysdeps/unix/sysv/linux
-I../linuxthreads/sysdeps/pthread -I../linuxthreads/sysdeps/unix/sysv
-I../linuxthreads/sysdeps/unix -I../linuxthreads/sysdeps/i386/i686
-I../linuxthreads/sysdeps/i386 -I../sysdeps/unix/sysv/linux/i386/i686
-I../sysdeps/unix/sysv/linux/i386 -I../sysdeps/unix/sysv/linux -I../sysdeps/gnu
-I../sysdeps/unix/common -I../sysdeps/unix/mman -I../sysdeps/unix/inet
-I../sysdeps/unix/sysv/i386 -I../sysdeps/unix/sysv -I../sysdeps/unix/i386
-I../sysdeps/unix -I../sysdeps/posix -I../sysdeps/i386/i686 -I../sysdeps/i386/i486
-I../sysdeps/libm-i387/i686 -I../sysdeps/i386/fpu -I../sysdeps/libm-i387 -I../sysdeps/i386
-I../sysdeps/wordsize-32 -I../sysdeps/ieee754 -I../sysdeps/libm-ieee754
-I../sysdeps/generic/elf -I../sysdeps/generic   -D_LIBC_REENTRANT -include
../include/libc-symbols.h     -o crypt_util.o
../crypt/sysdeps/unix/crypt_util.c:268: libc-lock.h: No such file or directory
make[1]: *** [crypt_util.o] Error 1
make[1]: Leaving directory `/home/jlh/tmp/glibc-2.1.2/md5-crypt'
make: *** [md5-crypt/others] Error 2


I need to compile in both the crypt and linuxthreads, but the crypt part
is dying here.

Any suggestions appreciated.  Thanks,

John Hoebing
jlh@geodesic.com