patches/glibc/ports-2.10.1/140-disable-ldconfig.patch
author Johannes Stezenbach <js@sig21.net>
Sun Oct 14 23:46:15 2012 +0000 (2012-10-14)
changeset 3082 39ec9e913d79
permissions -rw-r--r--
scripts: move backtrace marker to CT_WORK_DIR

Avoid error when commands in scripts/crosstool-NG.sh fail
before CT_BUILD_DIR is set.

So we need to remove the backtrace marker of a potential previous
build. Previously, it was implicitly removed because we did remove
the directory it was in, which is no longer the case.

Signed-off-by: Johannes Stezenbach <js@sig21.net>
[yann.morin.1998@free.fr: remove backtrace marker on start of build]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Message-Id: <20121015094615.GA18673@sig21.net>
Patchwork-Id: 191498
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)