patches/glibc/ports-2.10.1/140-disable-ldconfig.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Jul 12 23:52:24 2011 +0200 (2011-07-12)
branch1.11
changeset 2558 b7317d2fe0e9
permissions -rw-r--r--
scripts, cc/gcc: do not fail on existing symlinks or build.log

If the user builds a toolchain over an existing one, so, without removing
CT_PREFIX_DIR, the build fails as the symlinks already exist, as does the
build.log.

This can also happen (for build.log) if the user first ran in download-
or extract-only.

Patch (with no SoB) originally from:
Phil Wilshire <phil.wilshire@overturenetworks.com>

Modified by me as it did not apply cleanly.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
(transplanted from 1ebc2248cc60230cd53ff94ae8f8f1e3261461a3)
yann@1625
     1
do not bother running ldconfig on DESTDIR.  it wants to write the temp cache
yann@1625
     2
file outside of the chroot.  doesnt matter anyways as we wont use the cache
yann@1625
     3
results (portage will rebuild cache), so running ldconfig is simply a waste
yann@1625
     4
of time.
yann@1625
     5
yann@1625
     6
diff -durN glibc-2.10.1.orig/Makefile glibc-2.10.1/Makefile
yann@1625
     7
--- glibc-2.10.1.orig/Makefile	2009-04-23 20:23:03.000000000 +0200
yann@1625
     8
+++ glibc-2.10.1/Makefile	2009-11-13 00:49:49.000000000 +0100
yann@1625
     9
@@ -116,6 +116,7 @@
yann@1625
    10
 	rm -f $(symbolic-link-list)
yann@1625
    11
 
yann@1625
    12
 install:
yann@1625
    13
+dont-bother-with-destdir:
yann@1625
    14
 	-test ! -x $(common-objpfx)elf/ldconfig || LC_ALL=C LANGUAGE=C \
yann@1625
    15
 	  $(common-objpfx)elf/ldconfig $(addprefix -r ,$(install_root)) \
yann@1625
    16
 				       $(slibdir) $(libdir)