diff options
Diffstat (limited to 'patches/duma')
| -rw-r--r-- | patches/duma/2_5_15/100-cross-compile.patch | 32 | ||||
| -rw-r--r-- | patches/duma/2_5_15/110-separate_cpp.patch | 19 | ||||
| -rw-r--r-- | patches/duma/2_5_15/200-cpp11-new-operator.patch | 96 |
3 files changed, 0 insertions, 147 deletions
diff --git a/patches/duma/2_5_15/100-cross-compile.patch b/patches/duma/2_5_15/100-cross-compile.patch deleted file mode 100644 index cc95160..0000000 --- a/patches/duma/2_5_15/100-cross-compile.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -durN duma_2_5_15.orig/GNUmakefile duma_2_5_15/GNUmakefile ---- duma_2_5_15.orig/GNUmakefile 2008-08-03 21:22:38.000000000 +0200 -+++ duma_2_5_15/GNUmakefile 2009-06-19 15:32:23.000000000 +0200 -@@ -93,10 +93,6 @@ - # also define 'WIN32' - - # some defaults: --CC=gcc --CXX=g++ --AR=ar --RANLIB=ranlib - INSTALL=install - RM=rm - RMFORCE=rm -f -@@ -471,7 +467,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) -@@ -532,7 +528,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 --git a/patches/duma/2_5_15/110-separate_cpp.patch b/patches/duma/2_5_15/110-separate_cpp.patch deleted file mode 100644 index 4bbccc7..0000000 --- a/patches/duma/2_5_15/110-separate_cpp.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -durN duma_2_5_15.orig/GNUmakefile duma_2_5_15/GNUmakefile ---- duma_2_5_15.orig/GNUmakefile 2009-06-19 16:41:53.000000000 +0200 -+++ duma_2_5_15/GNUmakefile 2009-06-19 16:43:53.000000000 +0200 -@@ -289,9 +289,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 - - # Make all the top-level targets the makefile knows about. - all: libduma.a tstheap$(EXEPOSTFIX) dumatest$(EXEPOSTFIX) thread-test$(EXEPOSTFIX) testmt$(EXEPOSTFIX) dumatestpp$(EXEPOSTFIX) testoperators$(EXEPOSTFIX) $(DUMA_DYN_DEPS) diff --git a/patches/duma/2_5_15/200-cpp11-new-operator.patch b/patches/duma/2_5_15/200-cpp11-new-operator.patch deleted file mode 100644 index 900333e..0000000 --- a/patches/duma/2_5_15/200-cpp11-new-operator.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff --git a/dumapp.cpp b/dumapp.cpp -index dbddf66..b5e9ba3 100644 ---- a/dumapp.cpp -+++ b/dumapp.cpp -@@ -189,8 +189,7 @@ void * duma_new_operator(DUMA_SIZE_T userSize, enum _DUMA_Allocator allocator, b - * Single object form, no debug information - * (11) = (a) ; ASW - */ --void * DUMA_CDECL operator new( DUMA_SIZE_T size ) --throw(std::bad_alloc) -+void * DUMA_CDECL operator new( DUMA_SIZE_T size ) NEW_THROW_SPEC - { - return duma_new_operator(size, EFA_NEW_ELEM, true DUMA_PARAMS_UK); - } -@@ -253,8 +252,7 @@ throw() - * Array object form, no debug information - * (21) = (a) ; AAW - */ --void * DUMA_CDECL operator new[]( DUMA_SIZE_T size ) --throw(std::bad_alloc) -+void * DUMA_CDECL operator new[]( DUMA_SIZE_T size ) NEW_THROW_SPEC - { - return duma_new_operator(size, EFA_NEW_ARRAY, true DUMA_PARAMS_UK); - } -@@ -320,8 +318,7 @@ throw() - * Single object form with debug information - * (31) = (a) ; ASW - */ --void * DUMA_CDECL operator new( DUMA_SIZE_T size, const char *filename, int lineno ) --throw( std::bad_alloc ) -+void * DUMA_CDECL operator new( DUMA_SIZE_T size, const char *filename, int lineno ) NEW_THROW_SPEC - { - return duma_new_operator(size, EFA_NEW_ELEM, true DUMA_PARAMS_FILELINE); - } -@@ -373,8 +370,7 @@ throw() - * Array object form with debug information - * (41) = (a) ; AAW - */ --void * DUMA_CDECL operator new[]( DUMA_SIZE_T size, const char *filename, int lineno ) --throw( std::bad_alloc ) -+void * DUMA_CDECL operator new[]( DUMA_SIZE_T size, const char *filename, int lineno ) NEW_THROW_SPEC - { - return duma_new_operator(size, EFA_NEW_ARRAY, true DUMA_PARAMS_FILELINE); - } -diff --git a/dumapp.h b/dumapp.h -index fc40d9a..7175359 100644 ---- a/dumapp.h -+++ b/dumapp.h -@@ -64,6 +64,11 @@ - #endif - #endif - -+#if __cplusplus <= 199711L -+#define NEW_THROW_SPEC throw(std::bad_alloc) -+#else -+#define NEW_THROW_SPEC -+#endif - - #ifndef DUMA_NO_CPP_SUPPORT - -@@ -81,7 +86,7 @@ - /* (12) = (b) ; ASN */ - /* (13) = (c) ; FSW */ - /* (14) = (d) ; FSN */ -- void * DUMA_CDECL operator new(DUMA_SIZE_T) throw(std::bad_alloc); -+ void * DUMA_CDECL operator new(DUMA_SIZE_T) NEW_THROW_SPEC; - void * DUMA_CDECL operator new(DUMA_SIZE_T, const std::nothrow_t &) throw(); - void DUMA_CDECL operator delete(void *) throw(); - void DUMA_CDECL operator delete(void *, const std::nothrow_t &) throw(); -@@ -91,7 +96,7 @@ - /* (22) = (b) ; AAN */ - /* (23) = (c) ; FAW */ - /* (24) = (d) ; FAN */ -- void * DUMA_CDECL operator new[](DUMA_SIZE_T) throw(std::bad_alloc); -+ void * DUMA_CDECL operator new[](DUMA_SIZE_T) NEW_THROW_SPEC; - void * DUMA_CDECL operator new[](DUMA_SIZE_T, const std::nothrow_t &) throw(); - void DUMA_CDECL operator delete[](void *) throw(); - void DUMA_CDECL operator delete[](void *, const std::nothrow_t &) throw(); -@@ -103,7 +108,7 @@ - /* (32) = (b) ; ASN */ - /* (33) = (c) ; FSW */ - /* (34) = (d) ; FSN */ -- void * DUMA_CDECL operator new(DUMA_SIZE_T, const char *, int) throw(std::bad_alloc); -+ void * DUMA_CDECL operator new(DUMA_SIZE_T, const char *, int) NEW_THROW_SPEC; - void * DUMA_CDECL operator new(DUMA_SIZE_T, const std::nothrow_t &, const char *, int) throw(); - void DUMA_CDECL operator delete(void *, const char *, int) throw(); - void DUMA_CDECL operator delete(void *, const std::nothrow_t &, const char *, int) throw(); -@@ -113,7 +118,7 @@ - /* (42) = (b) ; AAN */ - /* (43) = (c) ; FAW */ - /* (44) = (d) ; FAN */ -- void * DUMA_CDECL operator new[](DUMA_SIZE_T, const char *, int) throw(std::bad_alloc); -+ void * DUMA_CDECL operator new[](DUMA_SIZE_T, const char *, int) NEW_THROW_SPEC; - void * DUMA_CDECL operator new[](DUMA_SIZE_T, const std::nothrow_t &, const char *, int) throw(); - void DUMA_CDECL operator delete[](void *, const char *, int) throw(); - void DUMA_CDECL operator delete[](void *, const std::nothrow_t &, const char *, int) throw(); |