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.patch84
-rw-r--r--patches/duma/2_5_8/100-cross-compile.patch31
-rw-r--r--patches/duma/2_5_8/200-separate_cpp.patch19
3 files changed, 53 insertions, 81 deletions
diff --git a/patches/duma/2_5_1/100-cross-compile.patch b/patches/duma/2_5_1/100-cross-compile.patch
index 5c189aa..77dc98c 100644
--- a/patches/duma/2_5_1/100-cross-compile.patch
+++ b/patches/duma/2_5_1/100-cross-compile.patch
@@ -12,99 +12,21 @@ diff -dur duma_2_5_1/Makefile duma_2_5_1.orig/Makefile
INSTALL=install
############################################################
-@@ -169,31 +165,31 @@
+@@ -169,7 +165,7 @@
createconf: createconf.o
- rm -f createconf
- $(CC) $(CFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf
-+ $(HOSTCC) $(CFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf
++ $(HOSTCC) $(HOSTCFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf
tstheap: libduma.a tstheap.o
- rm -f tstheap
-- $(CC) $(CFLAGS) tstheap.o libduma.a -o tstheap $(LIBS)
-+ $(HOSTCC) $(CFLAGS) tstheap.o libduma.a -o tstheap $(LIBS)
-
- dumatest: libduma.a dumatest.o
- - rm -f dumatest
-- $(CC) $(CFLAGS) dumatest.o libduma.a -o dumatest $(LIBS)
-+ $(HOSTCC) $(CFLAGS) dumatest.o libduma.a -o dumatest $(LIBS)
-
- dumatestpp: libduma.a dumatestpp.o dumapp.h
- - rm -f dumatestpp
-- $(CXX) $(CPPFLAGS) dumatestpp.o libduma.a -o dumatestpp $(LIBS)
-+ $(HOSTCXX) $(CPPFLAGS) dumatestpp.o libduma.a -o dumatestpp $(LIBS)
-
- testoperators: libduma.a testoperators.o dumapp.h
- - rm -f testoperators
-- $(CXX) $(CPPFLAGS) testoperators.o libduma.a -o testoperators $(LIBS)
-+ $(HOSTCXX) $(CPPFLAGS) testoperators.o libduma.a -o testoperators $(LIBS)
-
- tstheap_so: tstheap_so.o
- - rm -f tstheap_so
-- $(CC) $(CFLAGS) tstheap_so.o -o tstheap_so $(LIBS)
-+ $(HOSTCC) $(CFLAGS) tstheap_so.o -o tstheap_so $(LIBS)
-
- dumatestpp_so: dumatestpp_so.o
- - rm -f dumatestpp_so
-- $(CXX) $(CPPFLAGS) dumatestpp_so.o -o dumatestpp_so $(LIBS)
-+ $(HOSTCXX) $(CPPFLAGS) dumatestpp_so.o -o dumatestpp_so $(LIBS)
-
-
- $(OBJECTS) tstheap.o dumatest.o dumatestpp.o: duma.h
@@ -211,7 +207,7 @@
# define rules how to build objects for createconf
#
createconf.o:
- $(CC) $(CFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@
-+ $(HOSTCC) $(CFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@
-
++ $(HOSTCC) $(HOSTCFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@
- #
-@@ -230,13 +226,6 @@
- print_so.o: print.c print.h
- $(CC) $(CFLAGS) $(DUMA_SO_OPTIONS) -c print.c -o $@
--# DUMA_SO_OPTIONS needed cause duma.h is included explicitly
--tstheap_so.o:
-- $(CC) $(CFLAGS) $(DUMA_SO_OPTIONS) -c tstheap.c -o $@
--
--dumatestpp_so.o:
-- $(CXX) $(CPPFLAGS) $(DUMA_SO_OPTIONS) -c dumatestpp.cpp -o $@
--
- #
- # define rules how to build objects for static library
#
-@@ -259,17 +248,23 @@
- #
-
- dumatest.o: dumatest.c duma.h duma_config.h
-- $(CC) $(CFLAGS) -c dumatest.c -o $@
-+ $(HOSTCC) $(CFLAGS) -c dumatest.c -o $@
-
- dumatestpp.o: dumatestpp.cpp duma.h dumapp.h duma_config.h
-- $(CXX) $(CPPFLAGS) -c dumatestpp.cpp -o $@
-+ $(HOSTCXX) $(CPPFLAGS) -c dumatestpp.cpp -o $@
-
- tstheap.o: tstheap.c duma.h duma_config.h
-- $(CC) $(CFLAGS) -c tstheap.c -o $@
-+ $(HOSTCC) $(CFLAGS) -c tstheap.c -o $@
-
- testoperators.o: testoperators.cpp duma.h dumapp.h duma_config.h
-- $(CXX) $(CPPFLAGS) -c testoperators.cpp -o $@
-+ $(HOSTCXX) $(CPPFLAGS) -c testoperators.cpp -o $@
-+
-+# DUMA_SO_OPTIONS needed cause duma.h is included explicitly
-+tstheap_so.o:
-+ $(HOSTCC) $(CFLAGS) $(DUMA_SO_OPTIONS) -c tstheap.c -o $@
-
-+dumatestpp_so.o:
-+ $(HOSTCXX) $(CPPFLAGS) $(DUMA_SO_OPTIONS) -c dumatestpp.cpp -o $@
-
- #
- # default rules
-@@ -280,5 +275,3 @@
- #.cpp.o:
- # $(CXX) $(CPPFLAGS) -c $< -o $@
- #
--
--
diff --git a/patches/duma/2_5_8/100-cross-compile.patch b/patches/duma/2_5_8/100-cross-compile.patch
new file mode 100644
index 0000000..bc96c9b
--- /dev/null
+++ b/patches/duma/2_5_8/100-cross-compile.patch
@@ -0,0 +1,31 @@
+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/200-separate_cpp.patch b/patches/duma/2_5_8/200-separate_cpp.patch
new file mode 100644
index 0000000..86aa6c0
--- /dev/null
+++ b/patches/duma/2_5_8/200-separate_cpp.patch
@@ -0,0 +1,19 @@
+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)