Mercurial > mxe-octave

comparison src/octave-3-fixes.patch @ 2953:9ee646095047

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
temporary fix for mkoctfile variables
author John W. Eaton <jwe@octave.org>
date Thu, 10 Jan 2013 17:42:30 -0500
parents
children 19aa16ec87c0
comparison
equal deleted inserted replaced
2952:09a58eb274f4 2953:9ee646095047
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 @@ -563,7 +563,12 @@
5 -e "s|%OCTAVE_CONF_MAGICK_CPPFLAGS%|\"${MAGICK_CPPFLAGS}\"|" \
6 -e "s|%OCTAVE_CONF_MAGICK_LDFLAGS%|\"${MAGICK_LDFLAGS}\"|" \
7 -e "s|%OCTAVE_CONF_MAGICK_LIBS%|\"${MAGICK_LIBS}\"|" \
8 + -e 's|%OCTAVE_CONF_MKOCTFILE_CC%|\"@MKOCTFILE_CC@\"|' \
9 + -e 's|%OCTAVE_CONF_MKOCTFILE_CXX%|\"@MKOCTFILE_CXX@\"|' \
10 + -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LD%|\"@MKOCTFILE_DL_LD@\"|' \
11 -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%|\"@MKOCTFILE_DL_LDFLAGS@\"|' \
12 + -e 's|%OCTAVE_CONF_MKOCTFILE_F77%|\"@MKOCTFILE_F77@\"|' \
13 + -e 's|%OCTAVE_CONF_MKOCTFILE_LD_CXX%|\"@MKOCTFILE_LD_CXX@\"|' \
14 -e "s|%OCTAVE_CONF_OCTAVE_LINK_DEPS%|\"${OCTAVE_LINK_DEPS}\"|" \
15 -e "s|%OCTAVE_CONF_OCTAVE_LINK_OPTS%|\"${OCTAVE_LINK_OPTS}\"|" \
16 -e "s|%OCTAVE_CONF_OCTINCLUDEDIR%|\"${octincludedir}\"|" \
17 diff --git a/configure.ac b/configure.ac
18 --- a/configure.ac
19 +++ b/configure.ac
20 @@ -1811,6 +1811,30 @@
21 AC_SUBST(LIBOCTINTERP)
22 AC_SUBST(LIBOCTAVE)
23
24 +if test "$cross_compiling" = yes && test -n "$ac_tool_prefix"; then
25 + MKOCTFILE_CC=`echo $CC | sed "s,$ac_tool_prefix,,"`
26 + MKOCTFILE_CXX=`echo $CXX | sed "s,$ac_tool_prefix,,"`
27 + MKOCTFILE_DL_LD=`echo $DL_LD | sed "s,$ac_tool_prefix,,"`
28 + MKOCTFILE_F77=`echo $F77 | sed "s,$ac_tool_prefix,,"`
29 + MKOCTFILE_LD_CXX=`echo $LD_CXX | sed "s,$ac_tool_prefix,,"`
30 +else
31 + MKOCTFILE_CC="$CC"
32 + MKOCTFILE_CXX="$CXX"
33 + MKOCTFILE_DL_LD="$DL_LD"
34 + MKOCTFILE_F77="$F77"
35 + MKOCTFILE_LD_CXX="$LD_CXX"
36 +fi
37 +AC_MSG_NOTICE([defining MKOCTFILE_CC to be $MKOCTFILE_CC])
38 +AC_MSG_NOTICE([defining MKOCTFILE_CXX to be $MKOCTFILE_CXX])
39 +AC_MSG_NOTICE([defining MKOCTFILE_DL_LD to be $MKOCTFILE_DL_LD])
40 +AC_MSG_NOTICE([defining MKOCTFILE_F77 to be $MKOCTFILE_F77])
41 +AC_MSG_NOTICE([defining MKOCTFILE_LD_CXX to be $MKOCTFILE_LD_CXX])
42 +AC_SUBST(MKOCTFILE_CC)
43 +AC_SUBST(MKOCTFILE_CXX)
44 +AC_SUBST(MKOCTFILE_DL_LD)
45 +AC_SUBST(MKOCTFILE_F77)
46 +AC_SUBST(MKOCTFILE_LD_CXX)
47 +
48 ### Check for existence of various libraries
49
50 ## OS-specific test for dirent, opendir.
51 diff --git a/src/mkoctfile.in.cc b/src/mkoctfile.in.cc
52 --- a/src/mkoctfile.in.cc
53 +++ b/src/mkoctfile.in.cc
54 @@ -202,13 +202,13 @@
55
56 vars["CPPFLAGS"] = get_variable ("CPPFLAGS", %OCTAVE_CONF_CPPFLAGS%);
57 vars["INCFLAGS"] = get_variable ("INCFLAGS", DEFAULT_INCFLAGS);
58 - vars["F77"] = get_variable ("F77", %OCTAVE_CONF_F77%);
59 + vars["F77"] = get_variable ("F77", %OCTAVE_CONF_MKOCTFILE_F77%);
60 vars["FFLAGS"] = get_variable ("FFLAGS", %OCTAVE_CONF_FFLAGS%);
61 vars["FPICFLAG"] = get_variable ("FPICFLAG", %OCTAVE_CONF_FPICFLAG%);
62 - vars["CC"] = get_variable ("CC", %OCTAVE_CONF_CC%);
63 + vars["CC"] = get_variable ("CC", %OCTAVE_CONF_MKOCTFILE_CC%);
64 vars["CFLAGS"] = get_variable ("CFLAGS", %OCTAVE_CONF_CFLAGS%);
65 vars["CPICFLAG"] = get_variable ("CPICFLAG", %OCTAVE_CONF_CPICFLAG%);
66 - vars["CXX"] = get_variable ("CXX", %OCTAVE_CONF_CXX%);
67 + vars["CXX"] = get_variable ("CXX", %OCTAVE_CONF_MKOCTFILE_CXX%);
68 vars["CXXFLAGS"] = get_variable ("CXXFLAGS", %OCTAVE_CONF_CXXFLAGS%);
69 vars["CXXPICFLAG"] = get_variable ("CXXPICFLAG", %OCTAVE_CONF_CXXPICFLAG%);
70 vars["XTRA_CFLAGS"] = get_variable ("XTRA_CFLAGS", %OCTAVE_CONF_XTRA_CFLAGS%);
71 @@ -217,7 +217,7 @@
72 vars["DEPEND_FLAGS"] = get_variable ("DEPEND_FLAGS", %OCTAVE_CONF_DEPEND_FLAGS%);
73 vars["DEPEND_EXTRA_SED_PATTERN"] = get_variable ("DEPEND_EXTRA_SED_PATTERN", %OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%);
74
75 - vars["DL_LD"] = get_variable ("DL_LD", %OCTAVE_CONF_DL_LD%);
76 + vars["DL_LD"] = get_variable ("DL_LD", %OCTAVE_CONF_MKOCTFILE_DL_LD%);
77 vars["DL_LDFLAGS"] = get_variable ("DL_LDFLAGS", %OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%);
78
79 vars["RDYNAMIC_FLAG"] = get_variable ("RDYNAMIC_FLAG", %OCTAVE_CONF_RDYNAMIC_FLAG%);
80 @@ -236,7 +236,7 @@
81 vars["OCT_LINK_DEPS"] = get_variable ("FLIBS", %OCTAVE_CONF_OCT_LINK_DEPS%);
82 vars["FLIBS"] = get_variable ("FLIBS", %OCTAVE_CONF_FLIBS%);
83
84 - vars["LD_CXX"] = get_variable ("LD_CXX", %OCTAVE_CONF_LD_CXX%);
85 + vars["LD_CXX"] = get_variable ("LD_CXX", %OCTAVE_CONF_MKOCTFILE_LD_CXX%);
86 vars["LDFLAGS"] = get_variable ("LDFLAGS", %OCTAVE_CONF_LDFLAGS%);
87 vars["LD_STATIC_FLAG"] = get_variable ("LD_STATIC_FLAG", %OCTAVE_CONF_LD_STATIC_FLAG%);
88 vars["LFLAGS"] = get_variable ("LFLAGS", DEFAULT_LFLAGS);
89 diff --git a/src/mkoctfile.in.sh b/src/mkoctfile.in.sh
90 --- a/src/mkoctfile.in.sh
91 +++ b/src/mkoctfile.in.sh
92 @@ -67,13 +67,13 @@
93
94 : ${CPPFLAGS=%OCTAVE_CONF_CPPFLAGS%}
95 : ${INCFLAGS=$DEFAULT_INCFLAGS}
96 -: ${F77=%OCTAVE_CONF_F77%}
97 +: ${F77=%OCTAVE_CONF_MKOCTFILE_F77%}
98 : ${FFLAGS=%OCTAVE_CONF_FFLAGS%}
99 : ${FPICFLAG=%OCTAVE_CONF_FPICFLAG%}
100 -: ${CC=%OCTAVE_CONF_CC%}
101 +: ${CC=%OCTAVE_CONF_MKOCTFILE_CC%}
102 : ${CFLAGS=%OCTAVE_CONF_CFLAGS%}
103 : ${CPICFLAG=%OCTAVE_CONF_CPICFLAG%}
104 -: ${CXX=%OCTAVE_CONF_CXX%}
105 +: ${CXX=%OCTAVE_CONF_MKOCTFILE_CXX%}
106 : ${CXXFLAGS=%OCTAVE_CONF_CXXFLAGS%}
107 : ${CXXPICFLAG=%OCTAVE_CONF_CXXPICFLAG%}
108 : ${XTRA_CFLAGS=%OCTAVE_CONF_XTRA_CFLAGS%}
109 @@ -82,7 +82,7 @@
110 : ${DEPEND_FLAGS=%OCTAVE_CONF_DEPEND_FLAGS%}
111 : ${DEPEND_EXTRA_SED_PATTERN=%OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%}
112
113 -: ${DL_LD=%OCTAVE_CONF_DL_LD%}
114 +: ${DL_LD=%OCTAVE_CONF_MKOCTFILE_DL_LD%}
115 : ${DL_LDFLAGS=%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%}
116
117 : ${RDYNAMIC_FLAG=%OCTAVE_CONF_RDYNAMIC_FLAG%}
118 @@ -101,7 +101,7 @@
119 : ${OCTAVE_LINK_OPTS=%OCTAVE_CONF_OCTAVE_LINK_OPTS%}
120 : ${OCT_LINK_DEPS=%OCTAVE_CONF_OCT_LINK_DEPS%}
121 : ${OCT_LINK_OPTS=%OCTAVE_CONF_OCT_LINK_OPTS%}
122 -: ${LD_CXX=%OCTAVE_CONF_LD_CXX%}
123 +: ${LD_CXX=%OCTAVE_CONF_MKOCTFILE_LD_CXX%}
124 : ${LDFLAGS=%OCTAVE_CONF_LDFLAGS%}
125 : ${LD_STATIC_FLAG=%OCTAVE_CONF_LD_STATIC_FLAG%}
126 : ${LFLAGS=$DEFAULT_LFLAGS}