1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/patches/glibc/2.9/310-2.3.6-fix-pr631.patch Mon Mar 15 21:51:20 2010 +0100
1.3 @@ -0,0 +1,50 @@
1.4 +Original patch from: gentoo/src/patchsets/glibc/2.9/1090_all_glibc-2.3.6-fix-pr631.patch
1.5 +
1.6 +-= BEGIN original header =-
1.7 +From dank@kegel.com
1.8 +Wed Jun 15 09:12:43 PDT 2005
1.9 +
1.10 +Fixes
1.11 +
1.12 +build-glibc/libc.a(nsswitch.o)(.data+0x64): undefined reference to `_nss_files_getaliasent_r'
1.13 +build-glibc/libc.a(nsswitch.o)(.data+0x6c): undefined reference to `_nss_files_endaliasent'
1.14 +... 53 lines deleted ...
1.15 +build-glibc/libc.a(nsswitch.o)(.data+0x21c): undefined reference to `_nss_files_getspnam_r'
1.16 +collect2: ld returned 1 exit status
1.17 +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.18 +
1.19 +when building glibc with --enable-static-nss.
1.20 +
1.21 +See http://sources.redhat.com/bugzilla/show_bug.cgi?id=631
1.22 +
1.23 +-= END original header =-
1.24 +
1.25 +diff -durN glibc-2_9.orig/Makeconfig glibc-2_9/Makeconfig
1.26 +--- glibc-2_9.orig/Makeconfig 2009-02-02 22:00:36.000000000 +0100
1.27 ++++ glibc-2_9/Makeconfig 2009-02-02 22:01:04.000000000 +0100
1.28 +@@ -509,7 +509,7 @@
1.29 +
1.30 + # The static libraries.
1.31 + ifeq (yes,$(build-static))
1.32 +-link-libc-static = $(common-objpfx)libc.a $(static-gnulib) $(common-objpfx)libc.a
1.33 ++link-libc-static = $(common-objpfx)libc.a $(static-gnulib) $(otherlibs) $(common-objpfx)libc.a
1.34 + else
1.35 + ifeq (yes,$(build-shared))
1.36 + # We can try to link the programs with lib*_pic.a...
1.37 +diff -durN glibc-2_9.orig/elf/Makefile glibc-2_9/elf/Makefile
1.38 +--- glibc-2_9.orig/elf/Makefile 2008-10-31 21:35:11.000000000 +0100
1.39 ++++ glibc-2_9/elf/Makefile 2009-02-02 22:01:04.000000000 +0100
1.40 +@@ -121,6 +121,13 @@
1.41 + install-bin-script = ldd
1.42 + endif
1.43 +
1.44 ++ifeq (yes,$(build-static-nss))
1.45 ++nssobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)nss)
1.46 ++resolvobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)resolv)
1.47 ++otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \
1.48 ++ $(resolvobjdir)/libresolv.a
1.49 ++endif
1.50 ++
1.51 + others = sprof sln
1.52 + install-bin = sprof
1.53 + others-static = sln