patches/glibc/ports-2.10.1/140-disable-ldconfig.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Tue May 08 18:31:10 2012 +0200 (2012-05-08)
changeset 2964 d48c03998dc1
permissions -rw-r--r--
scripts: fix catching failures

POSIX 1003.1-2008 does not say whether "set -e" should catch a sub-shell
that exits with !0 (it has a list of conditions to catch, but no list of
conditions not to catch, and this situation is not listed).

bash-3 does not catch such a failure, but bash-4 does. That why, on my
Squeeze system I did not see the issue, while Thomas did on is Lenny chroot.

Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
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)