patches/glibc/ports-2.12.1/140-disable-ldconfig.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Thu Dec 27 12:45:22 2012 +0100 (2012-12-27)
changeset 3152 b286c7993be5
permissions -rw-r--r--
scripts/addToolsVersion: properly handle .in vs. .in.2

While most components have their version in the .in file, some
have it in the .in.2 (eg. elf2flt).

Currently, to handle this case, we indiscriminately munge both files,
but this is wrong: in the elf2flt case, if we add a binutils version,
we do not want it to be added to elf2flt, and conversely.

So, for each tool, we need to explicitly know what file to munge.

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