1.1 --- a/patches/duma/2_5_1/100-cross-compile.patch Thu Jul 12 08:47:15 2007 +0000
1.2 +++ b/patches/duma/2_5_1/100-cross-compile.patch Fri Sep 07 21:31:01 2007 +0000
1.3 @@ -12,99 +12,21 @@
1.4 INSTALL=install
1.5
1.6 ############################################################
1.7 -@@ -169,31 +165,31 @@
1.8 +@@ -169,7 +165,7 @@
1.9
1.10 createconf: createconf.o
1.11 - rm -f createconf
1.12 - $(CC) $(CFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf
1.13 -+ $(HOSTCC) $(CFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf
1.14 ++ $(HOSTCC) $(HOSTCFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf
1.15
1.16 tstheap: libduma.a tstheap.o
1.17 - rm -f tstheap
1.18 -- $(CC) $(CFLAGS) tstheap.o libduma.a -o tstheap $(LIBS)
1.19 -+ $(HOSTCC) $(CFLAGS) tstheap.o libduma.a -o tstheap $(LIBS)
1.20 -
1.21 - dumatest: libduma.a dumatest.o
1.22 - - rm -f dumatest
1.23 -- $(CC) $(CFLAGS) dumatest.o libduma.a -o dumatest $(LIBS)
1.24 -+ $(HOSTCC) $(CFLAGS) dumatest.o libduma.a -o dumatest $(LIBS)
1.25 -
1.26 - dumatestpp: libduma.a dumatestpp.o dumapp.h
1.27 - - rm -f dumatestpp
1.28 -- $(CXX) $(CPPFLAGS) dumatestpp.o libduma.a -o dumatestpp $(LIBS)
1.29 -+ $(HOSTCXX) $(CPPFLAGS) dumatestpp.o libduma.a -o dumatestpp $(LIBS)
1.30 -
1.31 - testoperators: libduma.a testoperators.o dumapp.h
1.32 - - rm -f testoperators
1.33 -- $(CXX) $(CPPFLAGS) testoperators.o libduma.a -o testoperators $(LIBS)
1.34 -+ $(HOSTCXX) $(CPPFLAGS) testoperators.o libduma.a -o testoperators $(LIBS)
1.35 -
1.36 - tstheap_so: tstheap_so.o
1.37 - - rm -f tstheap_so
1.38 -- $(CC) $(CFLAGS) tstheap_so.o -o tstheap_so $(LIBS)
1.39 -+ $(HOSTCC) $(CFLAGS) tstheap_so.o -o tstheap_so $(LIBS)
1.40 -
1.41 - dumatestpp_so: dumatestpp_so.o
1.42 - - rm -f dumatestpp_so
1.43 -- $(CXX) $(CPPFLAGS) dumatestpp_so.o -o dumatestpp_so $(LIBS)
1.44 -+ $(HOSTCXX) $(CPPFLAGS) dumatestpp_so.o -o dumatestpp_so $(LIBS)
1.45 -
1.46 -
1.47 - $(OBJECTS) tstheap.o dumatest.o dumatestpp.o: duma.h
1.48 @@ -211,7 +207,7 @@
1.49 # define rules how to build objects for createconf
1.50 #
1.51 createconf.o:
1.52 - $(CC) $(CFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@
1.53 -+ $(HOSTCC) $(CFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@
1.54 ++ $(HOSTCC) $(HOSTCFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@
1.55
1.56
1.57 #
1.58 -@@ -230,13 +226,6 @@
1.59 - print_so.o: print.c print.h
1.60 - $(CC) $(CFLAGS) $(DUMA_SO_OPTIONS) -c print.c -o $@
1.61 -
1.62 --# DUMA_SO_OPTIONS needed cause duma.h is included explicitly
1.63 --tstheap_so.o:
1.64 -- $(CC) $(CFLAGS) $(DUMA_SO_OPTIONS) -c tstheap.c -o $@
1.65 --
1.66 --dumatestpp_so.o:
1.67 -- $(CXX) $(CPPFLAGS) $(DUMA_SO_OPTIONS) -c dumatestpp.cpp -o $@
1.68 --
1.69 - #
1.70 - # define rules how to build objects for static library
1.71 - #
1.72 -@@ -259,17 +248,23 @@
1.73 - #
1.74 -
1.75 - dumatest.o: dumatest.c duma.h duma_config.h
1.76 -- $(CC) $(CFLAGS) -c dumatest.c -o $@
1.77 -+ $(HOSTCC) $(CFLAGS) -c dumatest.c -o $@
1.78 -
1.79 - dumatestpp.o: dumatestpp.cpp duma.h dumapp.h duma_config.h
1.80 -- $(CXX) $(CPPFLAGS) -c dumatestpp.cpp -o $@
1.81 -+ $(HOSTCXX) $(CPPFLAGS) -c dumatestpp.cpp -o $@
1.82 -
1.83 - tstheap.o: tstheap.c duma.h duma_config.h
1.84 -- $(CC) $(CFLAGS) -c tstheap.c -o $@
1.85 -+ $(HOSTCC) $(CFLAGS) -c tstheap.c -o $@
1.86 -
1.87 - testoperators.o: testoperators.cpp duma.h dumapp.h duma_config.h
1.88 -- $(CXX) $(CPPFLAGS) -c testoperators.cpp -o $@
1.89 -+ $(HOSTCXX) $(CPPFLAGS) -c testoperators.cpp -o $@
1.90 -+
1.91 -+# DUMA_SO_OPTIONS needed cause duma.h is included explicitly
1.92 -+tstheap_so.o:
1.93 -+ $(HOSTCC) $(CFLAGS) $(DUMA_SO_OPTIONS) -c tstheap.c -o $@
1.94 -
1.95 -+dumatestpp_so.o:
1.96 -+ $(HOSTCXX) $(CPPFLAGS) $(DUMA_SO_OPTIONS) -c dumatestpp.cpp -o $@
1.97 -
1.98 - #
1.99 - # default rules
1.100 -@@ -280,5 +275,3 @@
1.101 - #.cpp.o:
1.102 - # $(CXX) $(CPPFLAGS) -c $< -o $@
1.103 - #
1.104 --
1.105 --