1.1 --- a/patches/glibc/2.3.6/200-glibc-2.3.6-fix-pr631.patch	Mon Jul 28 11:43:29 2008 +0000
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,45 +0,0 @@
     1.4 -From dank@kegel.com
     1.5 -Wed Jun 15 09:12:43 PDT 2005
     1.6 -
     1.7 -Fixes
     1.8 -
     1.9 -build-glibc/libc.a(nsswitch.o)(.data+0x64): undefined reference to `_nss_files_getaliasent_r'
    1.10 -build-glibc/libc.a(nsswitch.o)(.data+0x6c): undefined reference to `_nss_files_endaliasent'
    1.11 -... 53 lines deleted ...
    1.12 -build-glibc/libc.a(nsswitch.o)(.data+0x21c): undefined reference to `_nss_files_getspnam_r'
    1.13 -collect2: ld returned 1 exit status
    1.14 -make[2]: *** [/build/gcc-3.4.3-glibc-2.3.5-hdrs-2.6.11.2/i686-unknown-linux-gnu/build-glibc/elf/ldconfig] Error 1
    1.15 -
    1.16 -when building glibc with --enable-static-nss.
    1.17 -
    1.18 -See http://sources.redhat.com/bugzilla/show_bug.cgi?id=631
    1.19 -
    1.20 ---- glibc-2.3.5/Makeconfig.old	Wed Jun 15 08:13:12 2005
    1.21 -+++ glibc-2.3.5/Makeconfig	Wed Jun 15 08:13:14 2005
    1.22 -@@ -487,7 +487,7 @@
    1.23 - 
    1.24 - # The static libraries.
    1.25 - ifeq (yes,$(build-static))
    1.26 --link-libc-static = $(common-objpfx)libc.a $(static-gnulib) $(common-objpfx)libc.a
    1.27 -+link-libc-static = $(common-objpfx)libc.a $(static-gnulib) $(otherlibs) $(common-objpfx)libc.a
    1.28 - else
    1.29 - ifeq (yes,$(build-shared))
    1.30 - # We can try to link the programs with lib*_pic.a...
    1.31 ---- glibc-2.3.5/elf/Makefile.old	Wed Jun 15 07:46:49 2005
    1.32 -+++ glibc-2.3.5/elf/Makefile	Wed Jun 15 08:14:00 2005
    1.33 -@@ -115,6 +115,13 @@
    1.34 - install-bin-script = ldd
    1.35 - endif
    1.36 - 
    1.37 -+ifeq (yes,$(build-static-nss))
    1.38 -+nssobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)nss)
    1.39 -+resolvobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)resolv)
    1.40 -+otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \
    1.41 -+	     $(resolvobjdir)/libresolv.a
    1.42 -+endif
    1.43 -+
    1.44 - others		= sprof sln
    1.45 - install-bin	= sprof
    1.46 - others-static   = sln
    1.47 -
    1.48 -Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>