patches/duma/2_5_15/110-separate_cpp.patch
author Johannes Stezenbach <js@sig21.net>
Tue Oct 30 00:22:25 2012 +0000 (2012-10-30)
changeset 3097 5c67476c7342
parent 747 d3e603e7c17c
permissions -rw-r--r--
scripts/functions: fix endless loop in debug-shell with IO redirection

CT_DEBUG_INTERACTIVE is disabled when stdin, stdout or
stderr are redirected, but the check is only done at
the start of the build and doesn't catch when individual
build commands use redirection. When stdin is redirected
it will cause the debug shell to exit immediately, causing
and endless loop. Thus, save the stdin/our/err file handles
and restore them before invoking the debug shell.

Signed-off-by: Johannes Stezenbach <js@sig21.net>
Message-Id: <20121030102225.GA8303@sig21.net>
Patchwork-Id: 195409
yann@1436
     1
diff -durN duma_2_5_15.orig/GNUmakefile duma_2_5_15/GNUmakefile
yann@1436
     2
--- duma_2_5_15.orig/GNUmakefile	2009-06-19 16:41:53.000000000 +0200
yann@1436
     3
+++ duma_2_5_15/GNUmakefile	2009-06-19 16:43:53.000000000 +0200
yann@1436
     4
@@ -289,9 +289,13 @@
yann@572
     5
 	dumatest.c tstheap.c thread-test.c testmt.c dumatestpp.cpp testoperators.cpp \
yann@572
     6
 	createconf.c
yann@572
     7
 
yann@1436
     8
-OBJECTS=dumapp.o duma.o sem_inc.o print.o
yann@572
     9
+OBJECTS = duma.o sem_inc.o print.o
yann@572
    10
+SO_OBJECTS = duma_so.o sem_inc_so.o print_so.o
yann@572
    11
 
yann@1436
    12
-SO_OBJECTS=dumapp_so.o duma_so.o sem_inc_so.o print_so.o
yann@572
    13
+ifeq ($(DUMA_CPP),1)
yann@572
    14
+OBJECTS += dumapp.o
yann@572
    15
+SO_OBJECTS += dumapp_so.o
yann@572
    16
+endif
yann@572
    17
 
yann@1436
    18
 # Make all the top-level targets the makefile knows about.
yann@572
    19
 all:	libduma.a tstheap$(EXEPOSTFIX) dumatest$(EXEPOSTFIX) thread-test$(EXEPOSTFIX) testmt$(EXEPOSTFIX) dumatestpp$(EXEPOSTFIX) testoperators$(EXEPOSTFIX) $(DUMA_DYN_DEPS)