patches/duma/2_5_12/110-separate_cpp.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Tue Mar 11 22:11:43 2014 +0100 (2014-03-11)
changeset 3293 e11a8a2e225d
parent 430 5b7efc8dbf85
permissions -rw-r--r--
comptools: do not force build of make-3.81 unless really needed

On systems with make-3.82, we forcibly force the build and the use
of make-3.81

But some newer tools break when building with make-3.81. For example,
eglibc-3.18 breaks.

Introduce a new blind options that tools may select if they require
make-3.81. If the system does not have make-3.81, and this option is
selected, then we force the build of make-3.81. Otherwise, we leave
it to the user to decide on his own.

Note that no component selects this option for now. It will come in
later patches as we find them.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
     1 diff -durN duma_2_5_12.orig/Makefile duma_2_5_12/Makefile
     2 --- duma_2_5_12.orig/Makefile	2007-09-07 21:57:45.000000000 +0200
     3 +++ duma_2_5_12/Makefile	2007-09-07 21:58:35.000000000 +0200
     4 @@ -231,9 +231,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  all:	libduma.a tstheap$(EXEPOSTFIX) dumatest$(EXEPOSTFIX) thread-test$(EXEPOSTFIX) testmt$(EXEPOSTFIX) dumatestpp$(EXEPOSTFIX) testoperators$(EXEPOSTFIX) $(DUMA_DYN_DEPS)
    19  	@ $(ECHOLF)