patches/glibc/2.7/120-fix-pr631.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Aug 02 18:28:10 2011 +0200 (2011-08-02)
changeset 2590 b64cfb67944e
parent 744 4bf8448536d5
permissions -rw-r--r--
scripts/functions: svn retrieval first tries the mirror for tarballs

The svn download helper looks for the local tarballs dir to see if it
can find a pre-downloaded tarball, and if it does not find it, does
the actual fetch to upstream via svn.

In the process, it does not even try to get a tarball from the local
mirror, which can be useful if the mirror has been pre-populated
manually (or with a previously downloaded tree).

Fake a tarball get with the standard tarball-download helper, but
without specifying any upstream URL, which makes the helper directly
try the LAN mirror.

Of course, if no mirror is specified, no URL wil be available, and
the standard svn retrieval will kick in.

Reported-by: ANDY KENNEDY <ANDY.KENNEDY@adtran.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
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