patches/duma/2_5_15/110-separate_cpp.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Mon Jan 03 23:40:22 2011 +0100 (2011-01-03)
changeset 2267 7af68e6083aa
parent 747 d3e603e7c17c
permissions -rw-r--r--
libc-glibc: remove 2.3.6

This is an obsolete version which is no longer used by any sample (the only
user, the ia64 sample, has been removed).

It also makes the code path a bit complex, with twists just to accomodate
that version. Removing the version will make those twists go away, and
will ease commonalisation of glibc and eglibc in the future (hopefully!).

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
yann@1436
     1
diff -durN duma_2_5_15.orig/GNUmakefile duma_2_5_15/GNUmakefile
yann@1436
     2
--- duma_2_5_15.orig/GNUmakefile	2009-06-19 16:41:53.000000000 +0200
yann@1436
     3
+++ duma_2_5_15/GNUmakefile	2009-06-19 16:43:53.000000000 +0200
yann@1436
     4
@@ -289,9 +289,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@1436
     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@1436
    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@1436
    18
 # Make all the top-level targets the makefile knows about.
yann@572
    19
 all:	libduma.a tstheap$(EXEPOSTFIX) dumatest$(EXEPOSTFIX) thread-test$(EXEPOSTFIX) testmt$(EXEPOSTFIX) dumatestpp$(EXEPOSTFIX) testoperators$(EXEPOSTFIX) $(DUMA_DYN_DEPS)