Mercurial > mxe-octave

comparison src/stable-octave-2-fixes.patch @ 2955:19aa16ec87c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
import Octave fixes
author John W. Eaton <jwe@octave.org>
date Fri, 11 Jan 2013 22:33:32 -0500
parents
children
comparison
equal deleted inserted replaced
2954:f0fe5698ee67 2955:19aa16ec87c0
1 diff --git a/build-aux/common.mk b/build-aux/common.mk
2 --- a/build-aux/common.mk
3 +++ b/build-aux/common.mk
4 @@ -1,3 +1,5 @@
5 +CROSS_TOOL_PREFIX = @CROSS_TOOL_PREFIX@
6 +
7 AWK = @AWK@
8 export AWK
9
10 @@ -164,6 +166,15 @@
11
12 FLIBS = @FLIBS@
13
14 +MKOCTFILE_CC = @MKOCTFILE_CC@
15 +MKOCTFILE_CXX = @MKOCTFILE_CXX@
16 +MKOCTFILE_DL_LD = @MKOCTFILE_DL_LD@
17 +MKOCTFILE_DL_LDFLAGS = @MKOCTFILE_DL_LDFLAGS@
18 +MKOCTFILE_F77 = @MKOCTFILE_F77@
19 +MKOCTFILE_LD_CXX = @MKOCTFILE_LD_CXX@
20 +
21 +# List of libraries and their special compilation flags
22 +
23 LIBOCTINTERP = @LIBOCTINTERP@
24 LIBOCTAVE = @LIBOCTAVE@
25 LIBCRUFT = @LIBCRUFT@
26 @@ -539,7 +550,12 @@
27 -e "s|%OCTAVE_CONF_MAGICK_CPPFLAGS%|\"${MAGICK_CPPFLAGS}\"|" \
28 -e "s|%OCTAVE_CONF_MAGICK_LDFLAGS%|\"${MAGICK_LDFLAGS}\"|" \
29 -e "s|%OCTAVE_CONF_MAGICK_LIBS%|\"${MAGICK_LIBS}\"|" \
30 - -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%|\"@MKOCTFILE_DL_LDFLAGS@\"|' \
31 + -e 's|%OCTAVE_CONF_MKOCTFILE_CC%|\"${MKOCTFILE_CC}\"|' \
32 + -e 's|%OCTAVE_CONF_MKOCTFILE_CXX%|\"${MKOCTFILE_CXX}\"|' \
33 + -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LD%|\"${MKOCTFILE_DL_LD}\"|' \
34 + -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%|\"${MKOCTFILE_DL_LDFLAGS}\"|' \
35 + -e 's|%OCTAVE_CONF_MKOCTFILE_F77%|\"${MKOCTFILE_F77}\"|' \
36 + -e 's|%OCTAVE_CONF_MKOCTFILE_LD_CXX%|\"${MKOCTFILE_LD_CXX}\"|' \
37 -e "s|%OCTAVE_CONF_OCTAVE_LINK_DEPS%|\"${OCTAVE_LINK_DEPS}\"|" \
38 -e "s|%OCTAVE_CONF_OCTAVE_LINK_OPTS%|\"${OCTAVE_LINK_OPTS}\"|" \
39 -e "s|%OCTAVE_CONF_OCTINCLUDEDIR%|\"${octincludedir}\"|" \
40 diff --git a/configure.ac b/configure.ac
41 --- a/configure.ac
42 +++ b/configure.ac
43 @@ -1792,6 +1792,35 @@
44 OCTAVE_CMATH_FUNC(isinf)
45 OCTAVE_CMATH_FUNC(isfinite)
46
47 +if test "$cross_compiling" = yes && test -n "$ac_tool_prefix"; then
48 + CROSS_TOOL_PREFIX="$ac_tool_prefix"
49 + MKOCTFILE_CC='$(shell echo $(CC) | sed "s,$(CROSS_TOOL_PREFIX),,")'
50 + MKOCTFILE_CXX='$(shell echo $(CXX) | sed "s,$(CROSS_TOOL_PREFIX),,")'
51 + MKOCTFILE_DL_LD='$(shell echo $(DL_LD) | sed "s,$(CROSS_TOOL_PREFIX),,")'
52 + MKOCTFILE_F77='$(shell echo $(F77) | sed "s,$(CROSS_TOOL_PREFIX),,")'
53 + MKOCTFILE_LD_CXX='$(shell echo $(LD_CXX) | sed "s,$(CROSS_TOOL_PREFIX),,")'
54 +else
55 + MKOCTFILE_CC="$CC"
56 + MKOCTFILE_CXX="$CXX"
57 + MKOCTFILE_DL_LD="$DL_LD"
58 + MKOCTFILE_F77="$F77"
59 + MKOCTFILE_LD_CXX="$LD_CXX"
60 +fi
61 +AC_MSG_NOTICE([defining CROSS_TOOL_PREFIX to be $CROSS_TOOL_PREFIX])
62 +AC_MSG_NOTICE([defining MKOCTFILE_CC to be $MKOCTFILE_CC])
63 +AC_MSG_NOTICE([defining MKOCTFILE_CXX to be $MKOCTFILE_CXX])
64 +AC_MSG_NOTICE([defining MKOCTFILE_DL_LD to be $MKOCTFILE_DL_LD])
65 +AC_MSG_NOTICE([defining MKOCTFILE_F77 to be $MKOCTFILE_F77])
66 +AC_MSG_NOTICE([defining MKOCTFILE_LD_CXX to be $MKOCTFILE_LD_CXX])
67 +AC_SUBST(CROSS_TOOL_PREFIX)
68 +AC_SUBST(MKOCTFILE_CC)
69 +AC_SUBST(MKOCTFILE_CXX)
70 +AC_SUBST(MKOCTFILE_DL_LD)
71 +AC_SUBST(MKOCTFILE_F77)
72 +AC_SUBST(MKOCTFILE_LD_CXX)
73 +
74 +### Check for existence of various libraries
75 +
76 dnl Would like to get rid of this cruft, and just have
77 dnl
78 dnl AC_CHECK_FUNCS(finite isnan isinf)
79 diff --git a/src/mkoctfile.cc.in b/src/mkoctfile.cc.in
80 --- a/src/mkoctfile.cc.in
81 +++ b/src/mkoctfile.cc.in
82 @@ -201,13 +201,13 @@
83
84 vars["CPPFLAGS"] = get_variable ("CPPFLAGS", %OCTAVE_CONF_CPPFLAGS%);
85 vars["INCFLAGS"] = get_variable ("INCFLAGS", DEFAULT_INCFLAGS);
86 - vars["F77"] = get_variable ("F77", %OCTAVE_CONF_F77%);
87 + vars["F77"] = get_variable ("F77", %OCTAVE_CONF_MKOCTFILE_F77%);
88 vars["FFLAGS"] = get_variable ("FFLAGS", %OCTAVE_CONF_FFLAGS%);
89 vars["FPICFLAG"] = get_variable ("FPICFLAG", %OCTAVE_CONF_FPICFLAG%);
90 - vars["CC"] = get_variable ("CC", %OCTAVE_CONF_CC%);
91 + vars["CC"] = get_variable ("CC", %OCTAVE_CONF_MKOCTFILE_CC%);
92 vars["CFLAGS"] = get_variable ("CFLAGS", %OCTAVE_CONF_CFLAGS%);
93 vars["CPICFLAG"] = get_variable ("CPICFLAG", %OCTAVE_CONF_CPICFLAG%);
94 - vars["CXX"] = get_variable ("CXX", %OCTAVE_CONF_CXX%);
95 + vars["CXX"] = get_variable ("CXX", %OCTAVE_CONF_MKOCTFILE_CXX%);
96 vars["CXXFLAGS"] = get_variable ("CXXFLAGS", %OCTAVE_CONF_CXXFLAGS%);
97 vars["CXXPICFLAG"] = get_variable ("CXXPICFLAG", %OCTAVE_CONF_CXXPICFLAG%);
98 vars["XTRA_CFLAGS"] = get_variable ("XTRA_CFLAGS", %OCTAVE_CONF_XTRA_CFLAGS%);
99 @@ -216,7 +216,7 @@
100 vars["DEPEND_FLAGS"] = get_variable ("DEPEND_FLAGS", %OCTAVE_CONF_DEPEND_FLAGS%);
101 vars["DEPEND_EXTRA_SED_PATTERN"] = get_variable ("DEPEND_EXTRA_SED_PATTERN", %OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%);
102
103 - vars["DL_LD"] = get_variable ("DL_LD", %OCTAVE_CONF_DL_LD%);
104 + vars["DL_LD"] = get_variable ("DL_LD", %OCTAVE_CONF_MKOCTFILE_DL_LD%);
105 vars["DL_LDFLAGS"] = get_variable ("DL_LDFLAGS", %OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%);
106
107 vars["RDYNAMIC_FLAG"] = get_variable ("RDYNAMIC_FLAG", %OCTAVE_CONF_RDYNAMIC_FLAG%);
108 @@ -236,7 +236,7 @@
109 vars["OCT_LINK_DEPS"] = get_variable ("FLIBS", %OCTAVE_CONF_OCT_LINK_DEPS%);
110 vars["FLIBS"] = get_variable ("FLIBS", %OCTAVE_CONF_FLIBS%);
111
112 - vars["LD_CXX"] = get_variable ("LD_CXX", %OCTAVE_CONF_LD_CXX%);
113 + vars["LD_CXX"] = get_variable ("LD_CXX", %OCTAVE_CONF_MKOCTFILE_LD_CXX%);
114 vars["LDFLAGS"] = get_variable ("LDFLAGS", %OCTAVE_CONF_LDFLAGS%);
115 vars["LD_STATIC_FLAG"] = get_variable ("LD_STATIC_FLAG", %OCTAVE_CONF_LD_STATIC_FLAG%);
116 vars["LFLAGS"] = get_variable ("LFLAGS", DEFAULT_LFLAGS);
117 diff --git a/src/mkoctfile.in b/src/mkoctfile.in
118 --- a/src/mkoctfile.in
119 +++ b/src/mkoctfile.in
120 @@ -67,13 +67,13 @@
121
122 : ${CPPFLAGS=%OCTAVE_CONF_CPPFLAGS%}
123 : ${INCFLAGS=$DEFAULT_INCFLAGS}
124 -: ${F77=%OCTAVE_CONF_F77%}
125 +: ${F77=%OCTAVE_CONF_MKOCTFILE_F77%}
126 : ${FFLAGS=%OCTAVE_CONF_FFLAGS%}
127 : ${FPICFLAG=%OCTAVE_CONF_FPICFLAG%}
128 -: ${CC=%OCTAVE_CONF_CC%}
129 +: ${CC=%OCTAVE_CONF_MKOCTFILE_CC%}
130 : ${CFLAGS=%OCTAVE_CONF_CFLAGS%}
131 : ${CPICFLAG=%OCTAVE_CONF_CPICFLAG%}
132 -: ${CXX=%OCTAVE_CONF_CXX%}
133 +: ${CXX=%OCTAVE_CONF_MKOCTFILE_CXX%}
134 : ${CXXFLAGS=%OCTAVE_CONF_CXXFLAGS%}
135 : ${CXXPICFLAG=%OCTAVE_CONF_CXXPICFLAG%}
136 : ${XTRA_CFLAGS=%OCTAVE_CONF_XTRA_CFLAGS%}
137 @@ -82,7 +82,7 @@
138 : ${DEPEND_FLAGS=%OCTAVE_CONF_DEPEND_FLAGS%}
139 : ${DEPEND_EXTRA_SED_PATTERN=%OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%}
140
141 -: ${DL_LD=%OCTAVE_CONF_DL_LD%}
142 +: ${DL_LD=%OCTAVE_CONF_MKOCTFILE_DL_LD%}
143 : ${DL_LDFLAGS=%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%}
144
145 : ${RDYNAMIC_FLAG=%OCTAVE_CONF_RDYNAMIC_FLAG%}
146 @@ -102,7 +102,7 @@
147 : ${OCTAVE_LINK_OPTS=%OCTAVE_CONF_OCTAVE_LINK_OPTS%}
148 : ${OCT_LINK_DEPS=%OCTAVE_CONF_OCT_LINK_DEPS%}
149 : ${OCT_LINK_OPTS=%OCTAVE_CONF_OCT_LINK_OPTS%}
150 -: ${LD_CXX=%OCTAVE_CONF_LD_CXX%}
151 +: ${LD_CXX=%OCTAVE_CONF_MKOCTFILE_LD_CXX%}
152 : ${LDFLAGS=%OCTAVE_CONF_LDFLAGS%}
153 : ${LD_STATIC_FLAG=%OCTAVE_CONF_LD_STATIC_FLAG%}
154 : ${LFLAGS=$DEFAULT_LFLAGS}