patches/glibc/ports-2.12.1/140-disable-ldconfig.patch
author "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
Fri Jul 29 13:04:49 2011 +0200 (2011-07-29)
changeset 2574 6e1412ba8da9
permissions -rw-r--r--
scripts/functions: force extract folder to archive basename

Some archives like those of the 2011.07 revisions of Linaro GCC contain a folder
name different from the archive basename, which leads to errors afterwards, e.g.
when patching. E.g.:
gcc-linaro-4.5-2011.07.tar.bz2 extracts to gcc-linaro-4.5-2011.07-0/

This patch changes CT_Extract() to force the extraction of all archives to a
folder named like the archive basename. E.g.:
gcc-linaro-4.5-2011.07.tar.bz2 now extracts to gcc-linaro-4.5-2011.07/

Signed-off-by: "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
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)