Mercurialcrosstool-ng / annotate
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/duma/2_5_14/110-separate_cpp.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Mon Mar 28 01:05:18 2011 +0200 (2011-03-28)
changeset 2362 0888065f8c4d
parent 572 944e145f3890
permissions -rw-r--r--
cc/gcc: cleanup the _or_later logic

So far, we've had a version always select appropriate _or_later option,
which in turn would select all previous _or_later options.

Because the dependencies on companion libs were cumulative, that was
working OK. But the upcoming 4.6 will no longer depend on libelf, so
we can't keep the cumulative scheme we've been using so far.

Have each release family select the corresponding dependencies, instead
of relying on selecting previous _or_later.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
yann@572 
     1
 
diff -durN duma_2_5_14.orig/Makefile duma_2_5_14/Makefile
yann@572 
     2
 
--- duma_2_5_14.orig/Makefile	2008-06-17 10:30:40.000000000 +0200
yann@572 
     3
 
+++ duma_2_5_14/Makefile	2008-06-17 10:30:17.000000000 +0200
yann@572 
     4
 
@@ -228,9 +228,13 @@
yann@572 
     5
 
 	dumatest.c tstheap.c thread-test.c testmt.c dumatestpp.cpp testoperators.cpp \
yann@572 
     6
 
 	createconf.c
yann@572 
     7
yann@572 
     8
 
-OBJECTS = dumapp.o duma.o sem_inc.o print.o
yann@572 
     9
 
+OBJECTS = duma.o sem_inc.o print.o
yann@572 
    10
 
+SO_OBJECTS = duma_so.o sem_inc_so.o print_so.o
yann@572 
    11
yann@572 
    12
 
-SO_OBJECTS = dumapp_so.o duma_so.o sem_inc_so.o print_so.o
yann@572 
    13
 
+ifeq ($(DUMA_CPP),1)
yann@572 
    14
 
+OBJECTS += dumapp.o
yann@572 
    15
 
+SO_OBJECTS += dumapp_so.o
yann@572 
    16
 
+endif
yann@572 
    17
yann@572 
    18
 
 all:	libduma.a tstheap$(EXEPOSTFIX) dumatest$(EXEPOSTFIX) thread-test$(EXEPOSTFIX) testmt$(EXEPOSTFIX) dumatestpp$(EXEPOSTFIX) testoperators$(EXEPOSTFIX) $(DUMA_DYN_DEPS)
yann@572 
    19
crosstool-ng