Mercurial > mxe-octave

comparison src/of-windows-1-fixes.patch @ 4413:d9eba31bd16b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-windows: add patch so compiled with octave 4.3.0+ * src/of-windows-1-fixes.patch: new file * dist-files.mk: add of-windows-1-fixes.patch * src/of-windows.mk: call autogen on modded configure file
author John D
date Tue, 11 Jul 2017 15:07:23 -0400
parents
children 8c51e3a9d984
comparison
equal deleted inserted replaced
4412:32b1643d16c1 4413:d9eba31bd16b
1 diff -r e250da446676 src/Makeconf.in
2 --- a/src/Makeconf.in Tue Jul 11 08:15:24 2017 -0400
3 +++ b/src/Makeconf.in Tue Jul 11 11:07:30 2017 -0400
4 @@ -59,8 +59,6 @@
5 MPATH = @mpath@
6 OPATH = @opath@
7 XPATH = @xpath@
8 -ALTMPATH = @altmpath@
9 -ALTOPATH = @altopath@
10
11 %.o: %.c ; $(MKOCTFILE) -c $<
12 %.o: %.f ; $(MKOCTFILE) -c $<
13 diff -r e250da446676 src/configure.base
14 --- a/src/configure.base Tue Jul 11 08:15:24 2017 -0400
15 +++ b/src/configure.base Tue Jul 11 11:07:30 2017 -0400
16 @@ -53,13 +53,9 @@
17 test -z "$OCTAVE_CONFIG" && AC_MSG_WARN([no octave-config found on path])
18
19 AC_SUBST(ver)
20 -AC_SUBST(subver)
21 AC_SUBST(mpath)
22 AC_SUBST(opath)
23 AC_SUBST(xpath)
24 -AC_SUBST(altpath)
25 -AC_SUBST(altmpath)
26 -AC_SUBST(altopath)
27
28 AC_ARG_WITH(path,
29 [ --with-path install path prefix],
30 @@ -73,83 +69,11 @@
31 AC_ARG_WITH(xpath,
32 [ --with-xpath override path for executables],
33 [xpath=$withval])
34 -AC_ARG_WITH(altpath,
35 - [ --with-altpath alternative functions install path prefix],
36 - [ altpath=$withval ])
37 -AC_ARG_WITH(altmpath,
38 - [ --with-altmpath override path for alternative m-files],
39 - [altmpath=$withval])
40 -AC_ARG_WITH(altopath,
41 - [ --with-altopath override path for alternative oct-files],
42 - [altopath=$withval])
43
44 if test -n "$path" ; then
45 test -z "$mpath" && mpath=$path
46 test -z "$opath" && opath=$path/oct
47 test -z "$xpath" && xpath=$path/bin
48 - test -z "$altpath" && altpath=$path-alternatives
49 -fi
50 -
51 -if test -n "$altpath" ; then
52 - test -z "$altmpath" && altmpath=$altpath
53 - test -z "$altopath" && altopath=$altpath/oct
54 -fi
55 -
56 -dnl Don't query if path/ver are given in the configure environment
57 -#if test -z "$mpath" || test -z "$opath" || test -z "$xpath" || test -z "$altmpath" || test -z "$altopath" || test -z "$ver" ; then
58 -if test -z "$mpath" || test -z "$opath" || test -z "$xpath" || test -z "$ver" ; then
59 - dnl Construct program to get mkoctfile version and local install paths
60 - cat > conftest.cc <<EOF
61 -#include <octave/oct.h>
62 -#include <octave/version.h>
63 -#include <octave/defaults.h>
64 -
65 -#define INFOV "\nINFOV=" OCTAVE_VERSION "\n"
66 -
67 -#define INFOH "\nINFOH=" OCTAVE_CANONICAL_HOST_TYPE "\n"
68 -
69 -#ifdef OCTAVE_LOCALVERFCNFILEDIR
70 -# define INFOM "\nINFOM=" OCTAVE_LOCALVERFCNFILEDIR "\n"
71 -#else
72 -# define INFOM "\nINFOM=" OCTAVE_LOCALFCNFILEPATH "\n"
73 -#endif
74 -
75 -#ifdef OCTAVE_LOCALVEROCTFILEDIR
76 -# define INFOO "\nINFOO=" OCTAVE_LOCALVEROCTFILEDIR "\n"
77 -#else
78 -# define INFOO "\nINFOO=" OCTAVE_LOCALOCTFILEPATH "\n"
79 -#endif
80 -
81 -#ifdef OCTAVE_LOCALVERARCHLIBDIR
82 -# define INFOX "\nINFOX=" OCTAVE_LOCALVERARCHLIBDIR "\n"
83 -#else
84 -# define INFOX "\nINFOX=" OCTAVE_LOCALARCHLIBDIR "\n"
85 -#endif
86 -
87 -const char *infom = INFOM;
88 -const char *infoo = INFOO;
89 -const char *infox = INFOX;
90 -const char *infoh = INFOH;
91 -const char *infov = INFOV;
92 -EOF
93 -
94 - dnl Compile program perhaps with a special version of mkoctfile
95 - $MKOCTFILE conftest.cc || AC_MSG_ERROR(Could not run $MKOCTFILE)
96 -
97 - dnl Strip the config info from the compiled file
98 - eval `strings conftest.o | grep "^INFO.=" | sed -e "s,//.*$,,"`
99 - rm -rf conftest*
100 -
101 - dnl set the appropriate variables if they are not already set
102 - ver=`echo $INFOV | sed -e "s/\.//" -e "s/\..*$//"`
103 - subver=`echo $INFOV | sed -e "[s/^[^.]*[.][^.]*[.]//]"`
104 - alt_mbase=`echo $INFOM | sed -e "[s,\/[^\/]*$,,]"`
105 - alt_obase=`echo $INFOO | sed -e "[s,/site.*$,/site,]"`
106 - test -z "$mpath" && mpath=$INFOM/octave-forge
107 - test -z "$opath" && opath=$INFOO/octave-forge
108 - test -z "$xpath" && xpath=$INFOX
109 - test -z "$altmpath" && altmpath=$alt_mbase/octave-forge-alternatives/m
110 - test -z "$altopath" && altopath=$alt_obase/octave-forge-alternatives/oct/$INFOH
111 fi
112
113 dnl *******************************************************************
114 @@ -268,7 +192,10 @@
115
116 dnl should check that $(OCTAVE) --version matches $(MKOCTFILE) --version
117 AC_CHECK_PROG(OCTAVE,octave,octave)
118 +
119 OCTAVE_CONFIG_EVAL(VERSION,OCTAVE_VERSION)
120 +dnl get major ver part as used for a HAVE_OCTAVE_XXX define
121 +ver=`echo $OCTAVE_VERSION | sed -e "s/\.//" -e "s/\..*$//"`
122
123 dnl grab canonical host type so we can write system specific install stuff
124 OCTAVE_CONFIG_EVAL(CANONICAL_HOST_TYPE,canonical_host_type)
125 @@ -276,6 +203,16 @@
126 dnl grab SHLEXT from octave config
127 OCTAVE_CONFIG_EVAL(SHLEXT,SHLEXT)
128
129 +if test -z "$mpath"; then
130 +OCTAVE_CONFIG_EVAL(LOCALVERFCNFILEDIR,mpath)
131 +fi
132 +if test -z "$opath"; then
133 +OCTAVE_CONFIG_EVAL(LOCALVEROCTFILEDIR,opath)
134 +fi
135 +if test -z "$xpath"; then
136 +OCTAVE_CONFIG_EVAL(LOCALVERARCHLIBDIR,xpath)
137 +fi
138 +
139 AC_PROG_LN_S
140
141 AC_PROG_RANLIB
142 @@ -348,9 +285,6 @@
143 m-files: $mpath
144 oct-files: $opath
145 binaries: $xpath
146 -alternatives:
147 - m-files: $altmpath
148 - oct-files: $altopath
149
150 shell commands will install into the following directories:
151 binaries: $bindir