patches/glibc/ports-2.10.1/140-disable-ldconfig.patch
author |
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> |
|
Tue Dec 13 23:32:39 2011 +0100 (2011-12-13) |
changeset 2807 |
4193d6e6a174 |
permissions |
-rw-r--r-- |
scripts: fix dumping execution backtrace
Dumping the backtrace has been broken since changeset #652e56d6d35a:
scripts: execute each steps in a subshell
We can spawn sub-sub-shells in some cases.
The way the fault handler works is to dump the backtrace, but to avoid
printing it once for every sub-shell (which could get quite confusing),
it simply exits when it detects that it is being run in a sub-shell,
leaving to the top-level shell the work to dump the backtrace.
Because each step is executed in its own sub-shell, the variable arrays
that contain the step name, the source file and line number, are lost
when exiting the per-step sub-shell.
Hence, the backtrace is currently limited to printing only the top-level
main procedure of the shell.
Fix this thus:
- when dumping the bckatraces for the steps & the functions, remember
it was dumped, and only dump it if it was not already dumped
- at the top-level shell, print the hints
Also, rename the top-level step label.
Reported-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.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)
|