[debug-duma] Add latest versions
Add 2.5.15, propagate patchset from 2_5_14 up to 2_5_15.
parent
88cac8531b
commit
76a9f0fd16
@ -0,0 +1,32 @@
|
||||
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 $@
|
||||
|
||||
|
||||
#
|
@ -0,0 +1,19 @@
|
||||
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)
|
Loading…
Reference in New Issue