patches/glibc/2.7/120-fix-pr631.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Thu Jun 11 21:47:19 2009 +0000 (2009-06-11)
branch1.4
changeset 1451 25d050084e98
parent 744 4bf8448536d5
permissions -rw-r--r--
populate: fix installing dynamic linker 'ld.so'

The dynamic linker, ld.so, needs the execute bit to be set.
Detect tht the library being installed is in fact ld.so and
install it with 0755 instead of 0644.

Fix detecting src == dst.

Use a simpler command to copy src -> dst.

Also change echo to printf, get rid of 'echo -n', which is
highly non-portable.


-------- diffstat follows --------
/trunk/scripts/populate.in | 76 43 33 0 +++++++++++++++++++++++++++++-----------------------
1 file changed, 43 insertions(+), 33 deletions(-)
(transplanted from d7ddcb75e0f703e2ba6d17169167356389224870)
yann@434
     1
From dank@kegel.com
yann@434
     2
Wed Jun 15 09:12:43 PDT 2005
yann@434
     3
yann@434
     4
Fixes
yann@434
     5
yann@434
     6
build-glibc/libc.a(nsswitch.o)(.data+0x64): undefined reference to `_nss_files_getaliasent_r'
yann@434
     7
build-glibc/libc.a(nsswitch.o)(.data+0x6c): undefined reference to `_nss_files_endaliasent'
yann@434
     8
... 53 lines deleted ...
yann@434
     9
build-glibc/libc.a(nsswitch.o)(.data+0x21c): undefined reference to `_nss_files_getspnam_r'
yann@434
    10
collect2: ld returned 1 exit status
yann@434
    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@434
    12
yann@434
    13
when building glibc with --enable-static-nss.
yann@434
    14
yann@434
    15
See http://sources.redhat.com/bugzilla/show_bug.cgi?id=631
yann@434
    16
yann@434
    17
--- glibc-2.3.5/Makeconfig.old	Wed Jun 15 08:13:12 2005
yann@434
    18
+++ glibc-2.3.5/Makeconfig	Wed Jun 15 08:13:14 2005
yann@434
    19
@@ -508,7 +508,7 @@
yann@434
    20
yann@434
    21
 # The static libraries.
yann@434
    22
 ifeq (yes,$(build-static))
yann@434
    23
-link-libc-static = $(common-objpfx)libc.a $(static-gnulib) $(common-objpfx)libc.a
yann@434
    24
+link-libc-static = $(common-objpfx)libc.a $(static-gnulib) $(otherlibs) $(common-objpfx)libc.a
yann@434
    25
 else
yann@434
    26
 ifeq (yes,$(build-shared))
yann@434
    27
 # We can try to link the programs with lib*_pic.a...
yann@434
    28
--- glibc-2.3.5/elf/Makefile.old	Wed Jun 15 07:46:49 2005
yann@434
    29
+++ glibc-2.3.5/elf/Makefile	Wed Jun 15 08:14:00 2005
yann@434
    30
@@ -120,6 +120,13 @@
yann@434
    31
 install-bin-script = ldd
yann@434
    32
 endif
yann@434
    33
yann@434
    34
+ifeq (yes,$(build-static-nss))
yann@434
    35
+nssobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)nss)
yann@434
    36
+resolvobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)resolv)
yann@434
    37
+otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \
yann@434
    38
+	     $(resolvobjdir)/libresolv.a
yann@434
    39
+endif
yann@434
    40
+
yann@434
    41
 others		= sprof sln
yann@434
    42
 install-bin	= sprof
yann@434
    43
 others-static   = sln