# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1203114151 0
# Node ID 5b7efc8dbf8539f7a82af5c4fd93c20016985e4f
# Parent  2da50549b3d3f6c839e0f35ba33e20308974cce9
Robert P. J. DAY says:

Add support for duma-2.5.12.

diff -r 2da50549b3d3 -r 5b7efc8dbf85 config/debug/duma.in
--- a/config/debug/duma.in	Fri Feb 15 21:33:39 2008 +0000
+++ b/config/debug/duma.in	Fri Feb 15 22:22:31 2008 +0000
@@ -34,6 +34,10 @@
     bool
     prompt "2_5_8"
 
+config DUMA_V_2_5_12
+    bool
+    prompt "2_5_12"
+
 # CT_INSERT_VERSION_ABOVE
 # Don't remove above line!
 endchoice
@@ -42,6 +46,7 @@
     string
     default "2_5_1" if DUMA_V_2_5_1
     default "2_5_8" if DUMA_V_2_5_8
+    default "2_5_12" if DUMA_V_2_5_12
 # CT_INSERT_VERSION_STRING_ABOVE
 # Don't remove above line!
 
diff -r 2da50549b3d3 -r 5b7efc8dbf85 patches/duma/2_5_12/100-cross-compile.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/duma/2_5_12/100-cross-compile.patch	Fri Feb 15 22:22:31 2008 +0000
@@ -0,0 +1,31 @@
+diff -durN duma_2_5_12.orig/Makefile duma_2_5_12/Makefile
+--- duma_2_5_12.orig/Makefile	2007-08-17 09:34:25.000000000 +0200
++++ duma_2_5_12/Makefile	2007-09-07 21:50:04.000000000 +0200
+@@ -93,9 +93,6 @@
+ # also define 'WIN32'
+
+ # some defaults:
+-CC=gcc
+-CXX=g++
+-AR=ar
+ INSTALL=install
+ RM=rm
+ RMFORCE=rm -f
+@@ -299,7 +296,7 @@
+
+ createconf$(EXEPOSTFIX): createconf.o
+ 	- $(RMFORCE) createconf$(EXEPOSTFIX)
+-	$(CC) $(CFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf$(EXEPOSTFIX)
++	$(HOSTCC) $(HOSTCFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf$(EXEPOSTFIX)
+
+ tstheap$(EXEPOSTFIX): libduma.a tstheap.o
+ 	- $(RMFORCE) tstheap$(EXEPOSTFIX)
+@@ -360,7 +357,7 @@
+ # define rules how to build objects for createconf
+ #
+ createconf.o:
+-	$(CC) $(CFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@
++	$(HOSTCC) $(HOSTCFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@
+
+
+ #
diff -r 2da50549b3d3 -r 5b7efc8dbf85 patches/duma/2_5_12/200-separate_cpp.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/duma/2_5_12/200-separate_cpp.patch	Fri Feb 15 22:22:31 2008 +0000
@@ -0,0 +1,19 @@
+diff -durN duma_2_5_12.orig/Makefile duma_2_5_12/Makefile
+--- duma_2_5_12.orig/Makefile	2007-09-07 21:57:45.000000000 +0200
++++ duma_2_5_12/Makefile	2007-09-07 21:58:35.000000000 +0200
+@@ -231,9 +231,13 @@
+ 	dumatest.c tstheap.c thread-test.c testmt.c dumatestpp.cpp testoperators.cpp \
+ 	createconf.c
+
+-OBJECTS = dumapp.o duma.o sem_inc.o print.o
++OBJECTS = duma.o sem_inc.o print.o
++SO_OBJECTS = duma_so.o sem_inc_so.o print_so.o
+
+-SO_OBJECTS = dumapp_so.o duma_so.o sem_inc_so.o print_so.o
++ifeq ($(DUMA_CPP),1)
++OBJECTS += dumapp.o
++SO_OBJECTS += dumapp_so.o
++endif
+
+ all:	libduma.a tstheap$(EXEPOSTFIX) dumatest$(EXEPOSTFIX) thread-test$(EXEPOSTFIX) testmt$(EXEPOSTFIX) dumatestpp$(EXEPOSTFIX) testoperators$(EXEPOSTFIX) $(DUMA_DYN_DEPS)
+ 	@ $(ECHOLF)