1.1 --- a/config/debug/duma.in Sun Aug 02 23:33:35 2009 +0200
1.2 +++ b/config/debug/duma.in Sun Aug 02 23:33:36 2009 +0200
1.3 @@ -37,6 +37,10 @@
1.4 bool
1.5 prompt "2_5_14"
1.6
1.7 +config DUMA_V_2_5_15
1.8 + bool
1.9 + prompt "2.5.15"
1.10 +
1.11 # CT_INSERT_VERSION_ABOVE
1.12 # Don't remove above line!
1.13 endchoice
1.14 @@ -47,5 +51,6 @@
1.15 default "2_5_8" if DUMA_V_2_5_8
1.16 default "2_5_12" if DUMA_V_2_5_12
1.17 default "2_5_14" if DUMA_V_2_5_14
1.18 + default "2.5.15" if DUMA_V_2_5_15
1.19 # CT_INSERT_VERSION_STRING_ABOVE
1.20 # Don't remove above line!
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2.2 +++ b/patches/duma/2_5_15/100-cross-compile.patch Sun Aug 02 23:33:36 2009 +0200
2.3 @@ -0,0 +1,32 @@
2.4 +diff -durN duma_2_5_15.orig/GNUmakefile duma_2_5_15/GNUmakefile
2.5 +--- duma_2_5_15.orig/GNUmakefile 2008-08-03 21:22:38.000000000 +0200
2.6 ++++ duma_2_5_15/GNUmakefile 2009-06-19 15:32:23.000000000 +0200
2.7 +@@ -93,10 +93,6 @@
2.8 + # also define 'WIN32'
2.9 +
2.10 + # some defaults:
2.11 +-CC=gcc
2.12 +-CXX=g++
2.13 +-AR=ar
2.14 +-RANLIB=ranlib
2.15 + INSTALL=install
2.16 + RM=rm
2.17 + RMFORCE=rm -f
2.18 +@@ -471,7 +467,7 @@
2.19 +
2.20 + createconf$(EXEPOSTFIX): createconf.o
2.21 + - $(RMFORCE) createconf$(EXEPOSTFIX)
2.22 +- $(CC) $(CFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf$(EXEPOSTFIX)
2.23 ++ $(HOSTCC) $(HOSTCFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf$(EXEPOSTFIX)
2.24 +
2.25 + tstheap$(EXEPOSTFIX): libduma.a tstheap.o
2.26 + - $(RMFORCE) tstheap$(EXEPOSTFIX)
2.27 +@@ -532,7 +528,7 @@
2.28 + # define rules how to build objects for createconf
2.29 + #
2.30 + createconf.o:
2.31 +- $(CC) $(CFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@
2.32 ++ $(HOSTCC) $(HOSTCFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@
2.33 +
2.34 +
2.35 + #
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2 +++ b/patches/duma/2_5_15/110-separate_cpp.patch Sun Aug 02 23:33:36 2009 +0200
3.3 @@ -0,0 +1,19 @@
3.4 +diff -durN duma_2_5_15.orig/GNUmakefile duma_2_5_15/GNUmakefile
3.5 +--- duma_2_5_15.orig/GNUmakefile 2009-06-19 16:41:53.000000000 +0200
3.6 ++++ duma_2_5_15/GNUmakefile 2009-06-19 16:43:53.000000000 +0200
3.7 +@@ -289,9 +289,13 @@
3.8 + dumatest.c tstheap.c thread-test.c testmt.c dumatestpp.cpp testoperators.cpp \
3.9 + createconf.c
3.10 +
3.11 +-OBJECTS=dumapp.o duma.o sem_inc.o print.o
3.12 ++OBJECTS = duma.o sem_inc.o print.o
3.13 ++SO_OBJECTS = duma_so.o sem_inc_so.o print_so.o
3.14 +
3.15 +-SO_OBJECTS=dumapp_so.o duma_so.o sem_inc_so.o print_so.o
3.16 ++ifeq ($(DUMA_CPP),1)
3.17 ++OBJECTS += dumapp.o
3.18 ++SO_OBJECTS += dumapp_so.o
3.19 ++endif
3.20 +
3.21 + # Make all the top-level targets the makefile knows about.
3.22 + all: libduma.a tstheap$(EXEPOSTFIX) dumatest$(EXEPOSTFIX) thread-test$(EXEPOSTFIX) testmt$(EXEPOSTFIX) dumatestpp$(EXEPOSTFIX) testoperators$(EXEPOSTFIX) $(DUMA_DYN_DEPS)