patches/duma/2_5_1/110-separate_cpp.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Dec 29 21:16:51 2009 +0100 (2009-12-29)
changeset 1667 a5020a1facff
parent 236 42650dc4e95e
permissions -rw-r--r--
config: fix generated config files when GREP_OPTIONS set --color=always

grep is used when generating some .in files (in config.gen). If GREP_OPTIONS
contains --color=always, then the generated files will contains some escape
sequences setting the color, and mconf would choke on those escape sequences.

Always set and export an empty GREP_OPTIONS to avoid that.

Issue reported by Kevin Kirkup <kevin dot kirkup at gmail dot com> :
http://sourceware.org/ml/crossgcc/2009-12/msg00026.html
yann@236
     1
diff -dur duma_2_5_1.orig/Makefile duma_2_5_1/Makefile
yann@236
     2
--- duma_2_5_1.orig/Makefile	2007-07-11 17:49:43.000000000 +0200
yann@236
     3
+++ duma_2_5_1/Makefile	2007-07-11 17:50:46.000000000 +0200
yann@236
     4
@@ -115,9 +115,14 @@
yann@236
     5
 	dumatest.c tstheap.c dumatestpp.cpp testoperators.cpp \
yann@236
     6
 	createconf.c
yann@236
     7
 
yann@236
     8
-OBJECTS = dumapp.o duma.o sem_inc.o print.o
yann@236
     9
+OBJECTS = duma.o sem_inc.o print.o
yann@236
    10
+SO_OBJECTS = duma_so.o sem_inc_so.o print_so.o
yann@236
    11
+
yann@236
    12
+ifeq ($(DUMA_CPP),1)
yann@236
    13
+OBJECTS += dumapp.o
yann@236
    14
+SO_OBJECTS += dumapp_so.o
yann@236
    15
+endif
yann@236
    16
 
yann@236
    17
-SO_OBJECTS = dumapp_so.o duma_so.o sem_inc_so.o print_so.o
yann@236
    18
 
yann@236
    19
 all:	libduma.a $(DUMASO) tstheap dumatest dumatestpp testoperators tstheap_so dumatestpp_so
yann@236
    20
 	@ echo "Testing DUMA."