patches/duma/2_5_1/110-separate_cpp.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Fri Oct 08 23:37:12 2010 +0200 (2010-10-08)
branch1.8
changeset 2150 f97a8ad2b172
parent 236 42650dc4e95e
permissions -rw-r--r--
cc/gcc: fix C++ headers location

In case we build the C++ compiler, we have to tell gcc where to put the C++
headers, or else it will try to # put it in prefix/tuple/include, which we
make a symlink to sysroot/usr/include during the build, and that we delete
(the symlink!) after the build, but gcc will not look in sysroot/usr/inlcude
for C++ headers by default.

Implements a fix suggested by: Bryan Hundven <bryanhundven@gmail.com>

Reported-by: Anthony Foiani <anthony.foiani@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
(transplanted from a0924619112015bdaa81a0a2313d21ef38607bc2)
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."