crosstool-ng: patches/glibc/ports-2.12.1/140-disable-ldconfig.patch@3ba359965eb0

scripts: fix sysroot prefix dir

The sysroot prefix dir was broken in #4960f5d9f829 due to a mishap
when making the out-of-sysroot lib/ symlink: the './' was mistakenly
changed into a single '.' .

Although Jonathan suggested restoring the missing '/' to restore it to
normal operation, I prefered using an explicit pushd/popd to be extra
sure of the symlink location and target, along with a fix in the sysroot
relative directory calculation.

Reported-by: Jonathan Grundon <JGrundon@xos.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
(transplanted from e5fc5c9ea78af28d05244ba09cf718cf75470903)

     1 do not bother running ldconfig on DESTDIR.  it wants to write the temp cache

     2 file outside of the chroot.  doesnt matter anyways as we wont use the cache

     3 results (portage will rebuild cache), so running ldconfig is simply a waste

     4 of time.

     6 diff -durN glibc-2.12.1.orig/Makefile glibc-2.12.1/Makefile

     7 --- glibc-2.12.1.orig/Makefile	2009-04-23 20:23:03.000000000 +0200

     8 +++ glibc-2.12.1/Makefile	2009-11-13 00:49:49.000000000 +0100

     9 @@ -116,6 +116,7 @@

    10  	rm -f $(symbolic-link-list)

    12  install:

    13 +dont-bother-with-destdir:

    14  	-test ! -x $(common-objpfx)elf/ldconfig || LC_ALL=C LANGUAGE=C \

    15  	  $(common-objpfx)elf/ldconfig $(addprefix -r ,$(install_root)) \

    16  				       $(slibdir) $(libdir)

author	"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
	Wed Sep 07 01:22:37 2011 +0200 (2011-09-07)
branch	1.12
changeset 2655	3ba359965eb0
permissions	-rw-r--r--