diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2007-09-07 21:31:01 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2007-09-07 21:31:01 (GMT) |
| commit | 011e23d0943aae72d5a9f9c109055e45d10362c8 (patch) | |
| tree | 7ebc36a0ae1abb0deb188ce099a7b120b7e7e51c /patches/duma/2_5_8 | |
| parent | c77336fb3d2b3205fee12e2e0cd44c0127bfce50 (diff) | |
Add D.U.M.A. 2_5_8 and associated patches.
Fix a patch for D.U.M.A 2_5_1.
Add libelf 0.8.10, still does not build... :-(
Diffstat (limited to 'patches/duma/2_5_8')
| -rw-r--r-- | patches/duma/2_5_8/100-cross-compile.patch | 31 | ||||
| -rw-r--r-- | patches/duma/2_5_8/200-separate_cpp.patch | 19 |
2 files changed, 50 insertions, 0 deletions
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) |