patches/glibc/ports-2.13/250-fix-pr631.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Wed May 18 23:00:46 2011 +0200 (2011-05-18)
changeset 2467 200836977ce6
permissions -rw-r--r--
config: rename variables that are arrays

Make it explicit that a variable is an array bu the name of the variable.
It will be used later when .config gets munged to allow both multiple
arguments and arguments with spaces at the same time to be passed from the
configuration down to the build scripts.

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