patches/glibc/ports-2.10.1/250-fix-pr631.patch
author Johannes Stezenbach <js@sig21.net>
Thu Jul 29 19:47:16 2010 +0200 (2010-07-29)
changeset 2045 fdaa6c7f6dea
permissions -rw-r--r--
cc/gcc: add option to compile against static libstdc++, for gcc-4.4 and newer

Idea and know-how taken from CodeSourcery build script.

Normal build:
$ ldd arm-unknown-linux-uclibcgnueabi-gcc
linux-gate.so.1 => (0xb77f3000)
libstdc++.so.6 => /usr/lib/libstdc++.so.6 (0xb76e8000)
libc.so.6 => /lib/i686/cmov/libc.so.6 (0xb75a1000)
libm.so.6 => /lib/i686/cmov/libm.so.6 (0xb757a000)
/lib/ld-linux.so.2 (0xb77f4000)
libgcc_s.so.1 => /lib/libgcc_s.so.1 (0xb755c000)

CC_STATIC_LIBSTDCXX=y:
$ ldd arm-unknown-linux-uclibcgnueabi-gcc
linux-gate.so.1 => (0xb7843000)
libc.so.6 => /lib/i686/cmov/libc.so.6 (0xb76e6000)
/lib/ld-linux.so.2 (0xb7844000)

I made CC_STATIC_LIBSTDCXX default=y since I think
it is always desirable.

Signed-off-by: Johannes Stezenbach <js@sig21.net>
yann@1625
     1
From dank@kegel.com
yann@1625
     2
Wed Jun 15 09:12:43 PDT 2005
yann@1625
     3
yann@1625
     4
Fixes
yann@1625
     5
yann@1625
     6
build-glibc/libc.a(nsswitch.o)(.data+0x64): undefined reference to `_nss_files_getaliasent_r'
yann@1625
     7
build-glibc/libc.a(nsswitch.o)(.data+0x6c): undefined reference to `_nss_files_endaliasent'
yann@1625
     8
... 53 lines deleted ...
yann@1625
     9
build-glibc/libc.a(nsswitch.o)(.data+0x21c): undefined reference to `_nss_files_getspnam_r'
yann@1625
    10
collect2: ld returned 1 exit status
yann@1625
    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
yann@1625
    12
yann@1625
    13
when building glibc with --enable-static-nss.
yann@1625
    14
yann@1625
    15
See http://sources.redhat.com/bugzilla/show_bug.cgi?id=631
yann@1625
    16
yann@1625
    17
diff -durN glibc-2.10.1.orig/Makeconfig glibc-2.10.1/Makeconfig
yann@1625
    18
--- glibc-2.10.1.orig/Makeconfig	2009-11-13 00:49:41.000000000 +0100
yann@1625
    19
+++ glibc-2.10.1/Makeconfig	2009-11-13 00:50:13.000000000 +0100
yann@1625
    20
@@ -509,7 +509,7 @@
yann@1625
    21
 
yann@1625
    22
 # The static libraries.
yann@1625
    23
 ifeq (yes,$(build-static))
yann@1625
    24
-link-libc-static = $(common-objpfx)libc.a $(static-gnulib) $(common-objpfx)libc.a
yann@1625
    25
+link-libc-static = $(common-objpfx)libc.a $(static-gnulib) $(otherlibs) $(common-objpfx)libc.a
yann@1625
    26
 else
yann@1625
    27
 ifeq (yes,$(build-shared))
yann@1625
    28
 # We can try to link the programs with lib*_pic.a...
yann@1625
    29
diff -durN glibc-2.10.1.orig/elf/Makefile glibc-2.10.1/elf/Makefile
yann@1625
    30
--- glibc-2.10.1.orig/elf/Makefile	2009-01-31 01:20:55.000000000 +0100
yann@1625
    31
+++ glibc-2.10.1/elf/Makefile	2009-11-13 00:50:13.000000000 +0100
yann@1625
    32
@@ -121,6 +121,13 @@
yann@1625
    33
 install-bin-script = ldd
yann@1625
    34
 endif
yann@1625
    35
 
yann@1625
    36
+ifeq (yes,$(build-static-nss))
yann@1625
    37
+nssobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)nss)
yann@1625
    38
+resolvobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)resolv)
yann@1625
    39
+otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \
yann@1625
    40
+	     $(resolvobjdir)/libresolv.a
yann@1625
    41
+endif
yann@1625
    42
+
yann@1625
    43
 others		= sprof sln
yann@1625
    44
 install-bin	= sprof
yann@1625
    45
 others-static   = sln