mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2025-01-21 03:55:15 +00:00
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... :-(
This commit is contained in:
Yann E. MORIN"
parent
c77336fb3d
commit
011e23d094
@ -30,15 +30,9 @@ config DUMA_V_2_5_1
|
||||
bool
|
||||
prompt "2_5_1"
|
||||
|
||||
config DUMA_V_2_5_2
|
||||
config DUMA_V_2_5_8
|
||||
bool
|
||||
prompt "2_5_2"
|
||||
depends on BROKEN
|
||||
|
||||
config DUMA_V_2_5_3
|
||||
bool
|
||||
prompt "2_5_3"
|
||||
depends on BROKEN
|
||||
prompt "2_5_8"
|
||||
|
||||
# CT_INSERT_VERSION_ABOVE
|
||||
# Don't remove above line!
|
||||
@ -47,8 +41,7 @@ endchoice
|
||||
config DUMA_VERSION
|
||||
string
|
||||
default "2_5_1" if DUMA_V_2_5_1
|
||||
default "2_5_2" if DUMA_V_2_5_2
|
||||
default "2_5_3" if DUMA_V_2_5_3
|
||||
default "2_5_8" if DUMA_V_2_5_8
|
||||
# CT_INSERT_VERSION_STRING_ABOVE
|
||||
# Don't remove above line!
|
||||
|
||||
|
||||
@ -28,6 +28,10 @@ config LIBELF_V_0_8_9
|
||||
bool
|
||||
prompt "0.8.9"
|
||||
|
||||
config LIBELF_V_0_8_10
|
||||
bool
|
||||
prompt "0.8.10"
|
||||
|
||||
# CT_INSERT_VERSION_ABOVE
|
||||
# Don't remove above line!
|
||||
endchoice
|
||||
@ -36,6 +40,7 @@ config LIBELF_VERSION
|
||||
string
|
||||
default "0.8.8" if LIBELF_V_0_8_8
|
||||
default "0.8.9" if LIBELF_V_0_8_9
|
||||
default "0.8.10" if LIBELF_V_0_8_10
|
||||
# CT_INSERT_VERSION_STRING_ABOVE
|
||||
# Don't remove above line!
|
||||
|
||||
|
||||
@ -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 $@
|
||||
#
|
||||
-
|
||||
-
|
||||
|
||||
31
patches/duma/2_5_8/100-cross-compile.patch
Normal file
31
patches/duma/2_5_8/100-cross-compile.patch
Normal file
@ -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 $@
|
||||
|
||||
|
||||
#
|
||||
19
patches/duma/2_5_8/200-separate_cpp.patch
Normal file
19
patches/duma/2_5_8/200-separate_cpp.patch
Normal file
@ -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)
|
||||
@ -44,7 +44,7 @@ do_debug_duma_build() {
|
||||
CC="${CT_TARGET}-${CT_CC}" \
|
||||
CXX="${CT_TARGET}-${CT_CC}" \
|
||||
DUMA_CPP="${DUMA_CPP}" \
|
||||
${lib} 2>&1 |CT_DoLog ALL
|
||||
${libs} 2>&1 |CT_DoLog ALL
|
||||
CT_DoLog EXTRA "Installing library \"${lib}\""
|
||||
install -m 644 "${lib}" "${CT_SYSROOT_DIR}/usr/lib" 2>&1 |CT_DoLog ALL
|
||||
done
|
||||
|
||||
Loading…
Reference in New Issue
Block a user