From 1d28793575d43d908b665fa6665d1b90b37f0af0 Mon Sep 17 00:00:00 2001 From: "Kirill K. Smirnov" Date: Wed, 14 Sep 2016 22:04:09 +0300 Subject: 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 --- patches/duma/2_5_1/100-cross-compile.patch | 32 ------------------------------ patches/duma/2_5_1/110-separate_cpp.patch | 20 ------------------- 2 files changed, 52 deletions(-) delete mode 100644 patches/duma/2_5_1/100-cross-compile.patch delete mode 100644 patches/duma/2_5_1/110-separate_cpp.patch (limited to 'patches/duma/2_5_1') 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 77dc98cb..00000000 --- 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 d228731c..00000000 --- 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." -- cgit v1.2.3