patches/duma/2_5_8/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 369 |
9258a7c3b84f
|
| 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>
|
yann@369
|
1 |
diff -durN duma_2_5_8.orig/Makefile duma_2_5_8/Makefile
|
|
yann@369
|
2 |
--- duma_2_5_8.orig/Makefile 2007-09-07 21:57:45.000000000 +0200
|
|
yann@369
|
3 |
+++ duma_2_5_8/Makefile 2007-09-07 21:58:35.000000000 +0200
|
|
yann@369
|
4 |
@@ -216,9 +216,13 @@
|
|
yann@369
|
5 |
dumatest.c tstheap.c testmt.c dumatestpp.cpp testoperators.cpp \
|
|
yann@369
|
6 |
createconf.c
|
|
yann@369
|
7 |
|
|
yann@369
|
8 |
-OBJECTS = dumapp.o duma.o sem_inc.o print.o
|
|
yann@369
|
9 |
+OBJECTS = duma.o sem_inc.o print.o
|
|
yann@369
|
10 |
+SO_OBJECTS = duma_so.o sem_inc_so.o print_so.o
|
|
yann@369
|
11 |
|
|
yann@369
|
12 |
-SO_OBJECTS = dumapp_so.o duma_so.o sem_inc_so.o print_so.o
|
|
yann@369
|
13 |
+ifeq ($(DUMA_CPP),1)
|
|
yann@369
|
14 |
+OBJECTS += dumapp.o
|
|
yann@369
|
15 |
+SO_OBJECTS += dumapp_so.o
|
|
yann@369
|
16 |
+endif
|
|
yann@369
|
17 |
|
|
yann@369
|
18 |
all: libduma.a tstheap$(EXEPOSTFIX) dumatest$(EXEPOSTFIX) testmt$(EXEPOSTFIX) dumatestpp$(EXEPOSTFIX) testoperators$(EXEPOSTFIX) $(DUMA_DYN_DEPS)
|
|
yann@369
|
19 |
@ $(ECHOLF)
|