diff options
| author |   Kirill K. Smirnov <kirill.k.smirnov@gmail.com> | 2016-09-14 19:04:09 (GMT) |
|---|---|---|
| committer | Kirill K. Smirnov <kirill.k.smirnov@gmail.com> | 2016-09-14 19:04:09 (GMT) |
| commit | 1d28793575d43d908b665fa6665d1b90b37f0af0 (patch) | |
| tree | 9e933df8cf1fcdda7b2d9ce0a3932adc540c6e9d /patches/duma/2_5_12 | |
| parent | 87088fe9b0d5293b1ca87abbbccc6c438deb188a (diff) | |
patches: remove obsolete D.U.M.A. patches
User cannot choose D.U.M.A. versions prior to 2.5.15 in config,
so remove useless patches.
Signed-off-by: Kirill K. Smirnov <kirill.k.smirnov@gmail.com>
Diffstat (limited to 'patches/duma/2_5_12')
| -rw-r--r-- | patches/duma/2_5_12/100-cross-compile.patch | 31 | ||||
| -rw-r--r-- | patches/duma/2_5_12/110-separate_cpp.patch | 19 |
2 files changed, 0 insertions, 50 deletions
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) |