patches/glibc/ports-2.12.1/100-respect-env-CPPFLAGS.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Dec 13 23:32:39 2011 +0100 (2011-12-13)
branch1.13
changeset 2847 c0bf2319af08
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>
(transplanted from 4193d6e6a17430a177fa88c287879c2c35e319f3)
yann@2437
     1
Respect environment CPPFLAGS when we run ./configure so we can inject
yann@2437
     2
random -D things without having to set CFLAGS/ASFLAGS
yann@2437
     3
yann@2437
     4
diff -durN glibc-2.12.1.orig/Makeconfig glibc-2.12.1/Makeconfig
yann@2437
     5
--- glibc-2.12.1.orig/Makeconfig	2009-05-09 23:57:56.000000000 +0200
yann@2437
     6
+++ glibc-2.12.1/Makeconfig	2009-11-13 00:49:41.000000000 +0100
yann@2437
     7
@@ -697,6 +697,7 @@
yann@2437
     8
 	   $(foreach lib,$(libof-$(basename $(@F))) \
yann@2437
     9
 		         $(libof-$(<F)) $(libof-$(@F)),$(CPPFLAGS-$(lib))) \
yann@2437
    10
 	   $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F)))
yann@2437
    11
+CPPFLAGS += $(CPPFLAGS-config)
yann@2437
    12
 override CFLAGS	= -std=gnu99 $(gnu89-inline-CFLAGS) \
yann@2437
    13
 		  $(filter-out %frame-pointer,$(+cflags)) $(+gccwarn-c) \
yann@2437
    14
 		  $(sysdep-CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) \
yann@2437
    15
diff -durN glibc-2.12.1.orig/config.make.in glibc-2.12.1/config.make.in
yann@2437
    16
--- glibc-2.12.1.orig/config.make.in	2009-05-09 17:59:38.000000000 +0200
yann@2437
    17
+++ glibc-2.12.1/config.make.in	2009-11-13 00:49:41.000000000 +0100
yann@2437
    18
@@ -107,6 +107,7 @@
yann@2437
    19
 CXX = @CXX@
yann@2437
    20
 BUILD_CC = @BUILD_CC@
yann@2437
    21
 CFLAGS = @CFLAGS@
yann@2437
    22
+CPPFLAGS-config = @CPPFLAGS@
yann@2437
    23
 ASFLAGS-config = @ASFLAGS_config@
yann@2437
    24
 AR = @AR@
yann@2437
    25
 RANLIB = @RANLIB@