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... :-(
1.1 --- a/config/debug/duma.in Thu Sep 06 14:00:28 2007 +0000
1.2 +++ b/config/debug/duma.in Fri Sep 07 21:31:01 2007 +0000
1.3 @@ -30,15 +30,9 @@
1.4 bool
1.5 prompt "2_5_1"
1.6
1.7 -config DUMA_V_2_5_2
1.8 +config DUMA_V_2_5_8
1.9 bool
1.10 - prompt "2_5_2"
1.11 - depends on BROKEN
1.12 -
1.13 -config DUMA_V_2_5_3
1.14 - bool
1.15 - prompt "2_5_3"
1.16 - depends on BROKEN
1.17 + prompt "2_5_8"
1.18
1.19 # CT_INSERT_VERSION_ABOVE
1.20 # Don't remove above line!
1.21 @@ -47,8 +41,7 @@
1.22 config DUMA_VERSION
1.23 string
1.24 default "2_5_1" if DUMA_V_2_5_1
1.25 - default "2_5_2" if DUMA_V_2_5_2
1.26 - default "2_5_3" if DUMA_V_2_5_3
1.27 + default "2_5_8" if DUMA_V_2_5_8
1.28 # CT_INSERT_VERSION_STRING_ABOVE
1.29 # Don't remove above line!
1.30
2.1 --- a/config/tools/libelf.in Thu Sep 06 14:00:28 2007 +0000
2.2 +++ b/config/tools/libelf.in Fri Sep 07 21:31:01 2007 +0000
2.3 @@ -28,6 +28,10 @@
2.4 bool
2.5 prompt "0.8.9"
2.6
2.7 +config LIBELF_V_0_8_10
2.8 + bool
2.9 + prompt "0.8.10"
2.10 +
2.11 # CT_INSERT_VERSION_ABOVE
2.12 # Don't remove above line!
2.13 endchoice
2.14 @@ -36,6 +40,7 @@
2.15 string
2.16 default "0.8.8" if LIBELF_V_0_8_8
2.17 default "0.8.9" if LIBELF_V_0_8_9
2.18 + default "0.8.10" if LIBELF_V_0_8_10
2.19 # CT_INSERT_VERSION_STRING_ABOVE
2.20 # Don't remove above line!
2.21
3.1 --- a/patches/duma/2_5_1/100-cross-compile.patch Thu Sep 06 14:00:28 2007 +0000
3.2 +++ b/patches/duma/2_5_1/100-cross-compile.patch Fri Sep 07 21:31:01 2007 +0000
3.3 @@ -12,99 +12,21 @@
3.4 INSTALL=install
3.5
3.6 ############################################################
3.7 -@@ -169,31 +165,31 @@
3.8 +@@ -169,7 +165,7 @@
3.9
3.10 createconf: createconf.o
3.11 - rm -f createconf
3.12 - $(CC) $(CFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf
3.13 -+ $(HOSTCC) $(CFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf
3.14 ++ $(HOSTCC) $(HOSTCFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf
3.15
3.16 tstheap: libduma.a tstheap.o
3.17 - rm -f tstheap
3.18 -- $(CC) $(CFLAGS) tstheap.o libduma.a -o tstheap $(LIBS)
3.19 -+ $(HOSTCC) $(CFLAGS) tstheap.o libduma.a -o tstheap $(LIBS)
3.20 -
3.21 - dumatest: libduma.a dumatest.o
3.22 - - rm -f dumatest
3.23 -- $(CC) $(CFLAGS) dumatest.o libduma.a -o dumatest $(LIBS)
3.24 -+ $(HOSTCC) $(CFLAGS) dumatest.o libduma.a -o dumatest $(LIBS)
3.25 -
3.26 - dumatestpp: libduma.a dumatestpp.o dumapp.h
3.27 - - rm -f dumatestpp
3.28 -- $(CXX) $(CPPFLAGS) dumatestpp.o libduma.a -o dumatestpp $(LIBS)
3.29 -+ $(HOSTCXX) $(CPPFLAGS) dumatestpp.o libduma.a -o dumatestpp $(LIBS)
3.30 -
3.31 - testoperators: libduma.a testoperators.o dumapp.h
3.32 - - rm -f testoperators
3.33 -- $(CXX) $(CPPFLAGS) testoperators.o libduma.a -o testoperators $(LIBS)
3.34 -+ $(HOSTCXX) $(CPPFLAGS) testoperators.o libduma.a -o testoperators $(LIBS)
3.35 -
3.36 - tstheap_so: tstheap_so.o
3.37 - - rm -f tstheap_so
3.38 -- $(CC) $(CFLAGS) tstheap_so.o -o tstheap_so $(LIBS)
3.39 -+ $(HOSTCC) $(CFLAGS) tstheap_so.o -o tstheap_so $(LIBS)
3.40 -
3.41 - dumatestpp_so: dumatestpp_so.o
3.42 - - rm -f dumatestpp_so
3.43 -- $(CXX) $(CPPFLAGS) dumatestpp_so.o -o dumatestpp_so $(LIBS)
3.44 -+ $(HOSTCXX) $(CPPFLAGS) dumatestpp_so.o -o dumatestpp_so $(LIBS)
3.45 -
3.46 -
3.47 - $(OBJECTS) tstheap.o dumatest.o dumatestpp.o: duma.h
3.48 @@ -211,7 +207,7 @@
3.49 # define rules how to build objects for createconf
3.50 #
3.51 createconf.o:
3.52 - $(CC) $(CFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@
3.53 -+ $(HOSTCC) $(CFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@
3.54 ++ $(HOSTCC) $(HOSTCFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@
3.55
3.56
3.57 #
3.58 -@@ -230,13 +226,6 @@
3.59 - print_so.o: print.c print.h
3.60 - $(CC) $(CFLAGS) $(DUMA_SO_OPTIONS) -c print.c -o $@
3.61 -
3.62 --# DUMA_SO_OPTIONS needed cause duma.h is included explicitly
3.63 --tstheap_so.o:
3.64 -- $(CC) $(CFLAGS) $(DUMA_SO_OPTIONS) -c tstheap.c -o $@
3.65 --
3.66 --dumatestpp_so.o:
3.67 -- $(CXX) $(CPPFLAGS) $(DUMA_SO_OPTIONS) -c dumatestpp.cpp -o $@
3.68 --
3.69 - #
3.70 - # define rules how to build objects for static library
3.71 - #
3.72 -@@ -259,17 +248,23 @@
3.73 - #
3.74 -
3.75 - dumatest.o: dumatest.c duma.h duma_config.h
3.76 -- $(CC) $(CFLAGS) -c dumatest.c -o $@
3.77 -+ $(HOSTCC) $(CFLAGS) -c dumatest.c -o $@
3.78 -
3.79 - dumatestpp.o: dumatestpp.cpp duma.h dumapp.h duma_config.h
3.80 -- $(CXX) $(CPPFLAGS) -c dumatestpp.cpp -o $@
3.81 -+ $(HOSTCXX) $(CPPFLAGS) -c dumatestpp.cpp -o $@
3.82 -
3.83 - tstheap.o: tstheap.c duma.h duma_config.h
3.84 -- $(CC) $(CFLAGS) -c tstheap.c -o $@
3.85 -+ $(HOSTCC) $(CFLAGS) -c tstheap.c -o $@
3.86 -
3.87 - testoperators.o: testoperators.cpp duma.h dumapp.h duma_config.h
3.88 -- $(CXX) $(CPPFLAGS) -c testoperators.cpp -o $@
3.89 -+ $(HOSTCXX) $(CPPFLAGS) -c testoperators.cpp -o $@
3.90 -+
3.91 -+# DUMA_SO_OPTIONS needed cause duma.h is included explicitly
3.92 -+tstheap_so.o:
3.93 -+ $(HOSTCC) $(CFLAGS) $(DUMA_SO_OPTIONS) -c tstheap.c -o $@
3.94 -
3.95 -+dumatestpp_so.o:
3.96 -+ $(HOSTCXX) $(CPPFLAGS) $(DUMA_SO_OPTIONS) -c dumatestpp.cpp -o $@
3.97 -
3.98 - #
3.99 - # default rules
3.100 -@@ -280,5 +275,3 @@
3.101 - #.cpp.o:
3.102 - # $(CXX) $(CPPFLAGS) -c $< -o $@
3.103 - #
3.104 --
3.105 --
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
4.2 +++ b/patches/duma/2_5_8/100-cross-compile.patch Fri Sep 07 21:31:01 2007 +0000
4.3 @@ -0,0 +1,31 @@
4.4 +diff -durN duma_2_5_8.orig/Makefile duma_2_5_8/Makefile
4.5 +--- duma_2_5_8.orig/Makefile 2007-08-17 09:34:25.000000000 +0200
4.6 ++++ duma_2_5_8/Makefile 2007-09-07 21:50:04.000000000 +0200
4.7 +@@ -93,9 +93,6 @@
4.8 + # also define 'WIN32'
4.9 +
4.10 + # some defaults:
4.11 +-CC=gcc
4.12 +-CXX=g++
4.13 +-AR=ar
4.14 + INSTALL=install
4.15 + RM=rm
4.16 + RMFORCE=rm -f
4.17 +@@ -281,7 +278,7 @@
4.18 +
4.19 + createconf$(EXEPOSTFIX): createconf.o
4.20 + - $(RMFORCE) createconf$(EXEPOSTFIX)
4.21 +- $(CC) $(CFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf$(EXEPOSTFIX)
4.22 ++ $(HOSTCC) $(HOSTCFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf$(EXEPOSTFIX)
4.23 +
4.24 + tstheap$(EXEPOSTFIX): libduma.a tstheap.o
4.25 + - $(RMFORCE) tstheap$(EXEPOSTFIX)
4.26 +@@ -338,7 +335,7 @@
4.27 + # define rules how to build objects for createconf
4.28 + #
4.29 + createconf.o:
4.30 +- $(CC) $(CFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@
4.31 ++ $(HOSTCC) $(HOSTCFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@
4.32 +
4.33 +
4.34 + #
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
5.2 +++ b/patches/duma/2_5_8/200-separate_cpp.patch Fri Sep 07 21:31:01 2007 +0000
5.3 @@ -0,0 +1,19 @@
5.4 +diff -durN duma_2_5_8.orig/Makefile duma_2_5_8/Makefile
5.5 +--- duma_2_5_8.orig/Makefile 2007-09-07 21:57:45.000000000 +0200
5.6 ++++ duma_2_5_8/Makefile 2007-09-07 21:58:35.000000000 +0200
5.7 +@@ -216,9 +216,13 @@
5.8 + dumatest.c tstheap.c testmt.c dumatestpp.cpp testoperators.cpp \
5.9 + createconf.c
5.10 +
5.11 +-OBJECTS = dumapp.o duma.o sem_inc.o print.o
5.12 ++OBJECTS = duma.o sem_inc.o print.o
5.13 ++SO_OBJECTS = duma_so.o sem_inc_so.o print_so.o
5.14 +
5.15 +-SO_OBJECTS = dumapp_so.o duma_so.o sem_inc_so.o print_so.o
5.16 ++ifeq ($(DUMA_CPP),1)
5.17 ++OBJECTS += dumapp.o
5.18 ++SO_OBJECTS += dumapp_so.o
5.19 ++endif
5.20 +
5.21 + all: libduma.a tstheap$(EXEPOSTFIX) dumatest$(EXEPOSTFIX) testmt$(EXEPOSTFIX) dumatestpp$(EXEPOSTFIX) testoperators$(EXEPOSTFIX) $(DUMA_DYN_DEPS)
5.22 + @ $(ECHOLF)
6.1 --- a/scripts/build/debug/duma.sh Thu Sep 06 14:00:28 2007 +0000
6.2 +++ b/scripts/build/debug/duma.sh Fri Sep 07 21:31:01 2007 +0000
6.3 @@ -44,7 +44,7 @@
6.4 CC="${CT_TARGET}-${CT_CC}" \
6.5 CXX="${CT_TARGET}-${CT_CC}" \
6.6 DUMA_CPP="${DUMA_CPP}" \
6.7 - ${lib} 2>&1 |CT_DoLog ALL
6.8 + ${libs} 2>&1 |CT_DoLog ALL
6.9 CT_DoLog EXTRA "Installing library \"${lib}\""
6.10 install -m 644 "${lib}" "${CT_SYSROOT_DIR}/usr/lib" 2>&1 |CT_DoLog ALL
6.11 done