Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/duma/2_5_15/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 747 d3e603e7c17c
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> 
     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)
crosstool-ng