patches/duma/2_5_15/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 747 d3e603e7c17c
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)
     1 diff -durN duma_2_5_15.orig/GNUmakefile duma_2_5_15/GNUmakefile
     2 --- duma_2_5_15.orig/GNUmakefile	2009-06-19 16:41:53.000000000 +0200
     3 +++ duma_2_5_15/GNUmakefile	2009-06-19 16:43:53.000000000 +0200
     4 @@ -289,9 +289,13 @@
     5  	dumatest.c tstheap.c thread-test.c testmt.c dumatestpp.cpp testoperators.cpp \
     6  	createconf.c
     7  
     8 -OBJECTS=dumapp.o duma.o sem_inc.o print.o
     9 +OBJECTS = duma.o sem_inc.o print.o
    10 +SO_OBJECTS = duma_so.o sem_inc_so.o print_so.o
    11  
    12 -SO_OBJECTS=dumapp_so.o duma_so.o sem_inc_so.o print_so.o
    13 +ifeq ($(DUMA_CPP),1)
    14 +OBJECTS += dumapp.o
    15 +SO_OBJECTS += dumapp_so.o
    16 +endif
    17  
    18  # Make all the top-level targets the makefile knows about.
    19  all:	libduma.a tstheap$(EXEPOSTFIX) dumatest$(EXEPOSTFIX) thread-test$(EXEPOSTFIX) testmt$(EXEPOSTFIX) dumatestpp$(EXEPOSTFIX) testoperators$(EXEPOSTFIX) $(DUMA_DYN_DEPS)