ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-02-20 17:12:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Introduce latest D.U.M.A. version and associated patches rediffed.

Browse Source 
/trunk/patches/duma/2_5_14/200-separate_cpp.patch  |   19    19     0     0 +++++++++++++++++
 /trunk/patches/duma/2_5_14/100-cross-compile.patch |   32    32     0     0 ++++++++++++++++++++++++++++
 /trunk/config/debug/duma.in                        |    5     5     0     0 ++++
 3 files changed, 56 insertions(+)
This commit is contained in:
Yann E. MORIN" 2008-06-17 22:28:17 +00:00
parent b9640aeaab
commit 1b822b4447
3 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/debug/duma.in
View File

@ -38,6 +38,10 @@ config DUMA_V_2_5_12
bool
prompt "2_5_12"
config DUMA_V_2_5_14
bool
prompt "2_5_14"
# CT_INSERT_VERSION_ABOVE
# Don't remove above line!
endchoice
@ -47,6 +51,7 @@ config DUMA_VERSION
default "2_5_1" if DUMA_V_2_5_1
default "2_5_8" if DUMA_V_2_5_8
default "2_5_12" if DUMA_V_2_5_12
default "2_5_14" if DUMA_V_2_5_14
# CT_INSERT_VERSION_STRING_ABOVE
# Don't remove above line!

32
patches/duma/2_5_14/100-cross-compile.patch Normal file
View File

@ -0,0 +1,32 @@
diff -durN duma_2_5_14.orig/Makefile duma_2_5_14/Makefile
--- duma_2_5_14.orig/Makefile 2008-03-13 00:54:10.000000000 +0100
+++ duma_2_5_14/Makefile 2008-06-17 10:28:45.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
@@ -317,7 +313,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)
@@ -378,7 +374,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 $@
#

19
patches/duma/2_5_14/200-separate_cpp.patch Normal file
View File

@ -0,0 +1,19 @@
diff -durN duma_2_5_14.orig/Makefile duma_2_5_14/Makefile
--- duma_2_5_14.orig/Makefile 2008-06-17 10:30:40.000000000 +0200
+++ duma_2_5_14/Makefile 2008-06-17 10:30:17.000000000 +0200
@@ -228,9 +228,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)