summaryrefslogtreecommitdiff
path: root/patches/duma
diff options
context:
space:
mode:
Diffstat (limited to 'patches/duma')
-rw-r--r--patches/duma/2_5_1/100-cross-compile.patch32
-rw-r--r--patches/duma/2_5_1/110-separate_cpp.patch20
-rw-r--r--patches/duma/2_5_12/100-cross-compile.patch31
-rw-r--r--patches/duma/2_5_12/110-separate_cpp.patch19
-rw-r--r--patches/duma/2_5_14/100-cross-compile.patch32
-rw-r--r--patches/duma/2_5_14/110-separate_cpp.patch19
-rw-r--r--patches/duma/2_5_15/200-cpp11-new-operator.patch96
-rw-r--r--patches/duma/2_5_8/100-cross-compile.patch31
-rw-r--r--patches/duma/2_5_8/110-separate_cpp.patch19
9 files changed, 96 insertions, 203 deletions
diff --git a/patches/duma/2_5_1/100-cross-compile.patch b/patches/duma/2_5_1/100-cross-compile.patch
deleted file mode 100644
index 77dc98c..0000000
--- a/patches/duma/2_5_1/100-cross-compile.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -dur duma_2_5_1/Makefile duma_2_5_1.orig/Makefile
---- duma_2_5_1/Makefile 2006-06-18 06:02:13.000000000 +0200
-+++ duma_2_5_1.orig/Makefile 2007-07-11 17:49:43.000000000 +0200
-@@ -98,10 +98,6 @@
- LIBS=-lpthread
- endif
-
--
--CC=gcc
--CXX=g++
--AR=ar
- INSTALL=install
-
- ############################################################
-@@ -169,7 +165,7 @@
-
- createconf: createconf.o
- - rm -f createconf
-- $(CC) $(CFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf
-+ $(HOSTCC) $(HOSTCFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf
-
- tstheap: libduma.a tstheap.o
- - rm -f tstheap
-@@ -211,7 +207,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_1/110-separate_cpp.patch b/patches/duma/2_5_1/110-separate_cpp.patch
deleted file mode 100644
index d228731..0000000
--- a/patches/duma/2_5_1/110-separate_cpp.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -dur duma_2_5_1.orig/Makefile duma_2_5_1/Makefile
---- duma_2_5_1.orig/Makefile 2007-07-11 17:49:43.000000000 +0200
-+++ duma_2_5_1/Makefile 2007-07-11 17:50:46.000000000 +0200
-@@ -115,9 +115,14 @@
- dumatest.c tstheap.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
-+
-+ifeq ($(DUMA_CPP),1)
-+OBJECTS += dumapp.o
-+SO_OBJECTS += dumapp_so.o
-+endif
-
--SO_OBJECTS = dumapp_so.o duma_so.o sem_inc_so.o print_so.o
-
- all: libduma.a $(DUMASO) tstheap dumatest dumatestpp testoperators tstheap_so dumatestpp_so
- @ echo "Testing DUMA."
diff --git a/patches/duma/2_5_12/100-cross-compile.patch b/patches/duma/2_5_12/100-cross-compile.patch
deleted file mode 100644
index 8401c0a..0000000
--- a/patches/duma/2_5_12/100-cross-compile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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 --git a/patches/duma/2_5_12/110-separate_cpp.patch b/patches/duma/2_5_12/110-separate_cpp.patch
deleted file mode 100644
index df2d377..0000000
--- a/patches/duma/2_5_12/110-separate_cpp.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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)
diff --git a/patches/duma/2_5_14/100-cross-compile.patch b/patches/duma/2_5_14/100-cross-compile.patch
deleted file mode 100644
index 8bb0735..0000000
--- a/patches/duma/2_5_14/100-cross-compile.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -durN duma_2_5_14.orig/Makefile duma_2_5_14/Makefile
---- duma_2_5_14.orig/Makefile 2008-03-13 00:54:10.000000000 +0100
-+++ duma_2_5_14/Makefile 2008-06-17 10:28:45.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
-@@ -317,7 +313,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)
-@@ -378,7 +374,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_14/110-separate_cpp.patch b/patches/duma/2_5_14/110-separate_cpp.patch
deleted file mode 100644
index bc287c4..0000000
--- a/patches/duma/2_5_14/110-separate_cpp.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -durN duma_2_5_14.orig/Makefile duma_2_5_14/Makefile
---- duma_2_5_14.orig/Makefile 2008-06-17 10:30:40.000000000 +0200
-+++ duma_2_5_14/Makefile 2008-06-17 10:30:17.000000000 +0200
-@@ -228,9 +228,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)
-
diff --git a/patches/duma/2_5_15/200-cpp11-new-operator.patch b/patches/duma/2_5_15/200-cpp11-new-operator.patch
new file mode 100644
index 0000000..900333e
--- /dev/null
+++ b/patches/duma/2_5_15/200-cpp11-new-operator.patch
@@ -0,0 +1,96 @@
+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();
diff --git a/patches/duma/2_5_8/100-cross-compile.patch b/patches/duma/2_5_8/100-cross-compile.patch
deleted file mode 100644
index bc96c9b..0000000
--- a/patches/duma/2_5_8/100-cross-compile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -durN duma_2_5_8.orig/Makefile duma_2_5_8/Makefile
---- duma_2_5_8.orig/Makefile 2007-08-17 09:34:25.000000000 +0200
-+++ duma_2_5_8/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
-@@ -281,7 +278,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)
-@@ -338,7 +335,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_8/110-separate_cpp.patch b/patches/duma/2_5_8/110-separate_cpp.patch
deleted file mode 100644
index 86aa6c0..0000000
--- a/patches/duma/2_5_8/110-separate_cpp.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -durN duma_2_5_8.orig/Makefile duma_2_5_8/Makefile
---- duma_2_5_8.orig/Makefile 2007-09-07 21:57:45.000000000 +0200
-+++ duma_2_5_8/Makefile 2007-09-07 21:58:35.000000000 +0200
-@@ -216,9 +216,13 @@
- dumatest.c tstheap.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) testmt$(EXEPOSTFIX) dumatestpp$(EXEPOSTFIX) testoperators$(EXEPOSTFIX) $(DUMA_DYN_DEPS)
- @ $(ECHOLF)
generated by cgit v0.10.2-6-g49f6 at 2024-07-07 18:22:34 (GMT)