patches/glibc/2.6.1/150-glibc-2.3.6-fix-pr631.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Thu Apr 17 20:26:25 2008 +0000 (2008-04-17)
changeset 446 d205527c5e01
permissions -rw-r--r--
Move config files around, and clean up the mess in the config/ directory.

config/kernel/kernel_linux.in | 12 6 6 0 +-
config/paths.in | 89 0 89 0 ----------------
config/kernel_linux_headers_install.in | 168 0 168 0 ------------------------------
config/kernel.in | 2 1 1 0
config/kernel_linux_headers_copy.in | 42 0 42 0 --------
config/cc.in | 2 1 1 0
config/logging.in | 110 0 110 0 --------------------
config/build-behave.in | 45 0 45 0 --------
config/libc_uClibc.in | 101 0 101 0 ------------------
config/kernel_linux_headers_sanitised.in | 62 0 62 0 -----------
config/ct-behave.in | 82 0 82 0 ---------------
config/kernel_linux.in | 134 0 134 0 ------------------------
config/global.in | 10 5 5 0 +-
config/download_extract.in | 171 0 171 0 -------------------------------
config/cc_gcc.in | 130 0 130 0 ------------------------
config/libc_glibc.in | 124 0 124 0 ----------------------
config/libc.in | 4 2 2 0
17 files changed, 15 insertions(+), 1273 deletions(-)
     1 From dank@kegel.com
     2 Wed Jun 15 09:12:43 PDT 2005
     3 
     4 Fixes
     5 
     6 build-glibc/libc.a(nsswitch.o)(.data+0x64): undefined reference to `_nss_files_getaliasent_r'
     7 build-glibc/libc.a(nsswitch.o)(.data+0x6c): undefined reference to `_nss_files_endaliasent'
     8 ... 53 lines deleted ...
     9 build-glibc/libc.a(nsswitch.o)(.data+0x21c): undefined reference to `_nss_files_getspnam_r'
    10 collect2: ld returned 1 exit status
    11 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
    12 
    13 when building glibc with --enable-static-nss.
    14 
    15 See http://sources.redhat.com/bugzilla/show_bug.cgi?id=631
    16 
    17 --- glibc-2.3.5/Makeconfig.old	Wed Jun 15 08:13:12 2005
    18 +++ glibc-2.3.5/Makeconfig	Wed Jun 15 08:13:14 2005
    19 @@ -510,7 +510,7 @@
    20  
    21  # The static libraries.
    22  ifeq (yes,$(build-static))
    23 -link-libc-static = $(common-objpfx)libc.a $(static-gnulib) $(common-objpfx)libc.a
    24 +link-libc-static = $(common-objpfx)libc.a $(static-gnulib) $(otherlibs) $(common-objpfx)libc.a
    25  else
    26  ifeq (yes,$(build-shared))
    27  # We can try to link the programs with lib*_pic.a...
    28 --- glibc-2.3.5/elf/Makefile.old	Wed Jun 15 07:46:49 2005
    29 +++ glibc-2.3.5/elf/Makefile	Wed Jun 15 08:14:00 2005
    30 @@ -120,6 +120,13 @@
    31  install-bin-script = ldd
    32  endif
    33  
    34 +ifeq (yes,$(build-static-nss))
    35 +nssobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)nss)
    36 +resolvobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)resolv)
    37 +otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \
    38 +	     $(resolvobjdir)/libresolv.a
    39 +endif
    40 +
    41  others		= sprof sln
    42  install-bin	= sprof
    43  others-static   = sln
    44 
    45 Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>