patches/glibc/ports-2.13/250-fix-pr631.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sat Dec 31 16:23:27 2011 +0100 (2011-12-31)
changeset 2814 3dc2727ebffc
permissions -rw-r--r--
cc/gcc: add option to use system zlib

In some cases, it might be desirable to use the system zlib

Eg. because latest gcc seem to be totally borked when it comes
to multilib, and tries to build a multilib host zlib, when it
is *absolutely* *not* needed: we want mulitlib on the target,
not on the host! Sigh... :-(

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
     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 diff -durN glibc-2.13.orig/Makeconfig glibc-2.13/Makeconfig
    18 --- glibc-2.13.orig/Makeconfig	2009-11-13 00:49:41.000000000 +0100
    19 +++ glibc-2.13/Makeconfig	2009-11-13 00:50:13.000000000 +0100
    20 @@ -531,7 +531,7 @@
    21  
    22  # The static libraries.
    23  ifeq (yes,$(build-static))
    24 -link-libc-static = $(common-objpfx)libc.a $(static-gnulib) $(common-objpfx)libc.a
    25 +link-libc-static = $(common-objpfx)libc.a $(static-gnulib) $(otherlibs) $(common-objpfx)libc.a
    26  else
    27  ifeq (yes,$(build-shared))
    28  # We can try to link the programs with lib*_pic.a...
    29 diff -durN glibc-2.13.orig/elf/Makefile glibc-2.13/elf/Makefile
    30 --- glibc-2.13.orig/elf/Makefile	2009-01-31 01:20:55.000000000 +0100
    31 +++ glibc-2.13/elf/Makefile	2009-11-13 00:50:13.000000000 +0100
    32 @@ -146,6 +146,13 @@
    33  install-bin-script = ldd
    34  endif
    35  
    36 +ifeq (yes,$(build-static-nss))
    37 +nssobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)nss)
    38 +resolvobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)resolv)
    39 +otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \
    40 +	     $(resolvobjdir)/libresolv.a
    41 +endif
    42 +
    43  others		= sprof sln
    44  install-bin	= sprof
    45  others-static   = sln