Mercurial > mxe-octave

annotate src/octave-2-fixes.patch @ 2943:18b9e08886d1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
also patch Octave's src/Makefile.in
author John W. Eaton <jwe@octave.org>
date Fri, 04 Jan 2013 15:52:58 -0500
parents 4b484be8aaf3
children 484c88cf1ecf
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2938
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 --- a/libinterp/octave.cc
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2 +++ b/libinterp/octave.cc
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3 @@ -656,6 +656,8 @@
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 {
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 octave_process_command_line (argc, argv);
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7 + sysdep_init ();
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 +
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 install_defaults ();
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11 octave_initialize_interpreter (argc, argv, embedded);
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 @@ -861,8 +863,6 @@
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
14 init_signals ();
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
15
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
16 - sysdep_init ();
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
17 -
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
18 octave_ieee_init ();
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
19
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
20 // The idea here is to force xerbla to be referenced so that we will
2942
4b484be8aaf3 update octave-2-fixes.patch
John W. Eaton <jwe@octave.org>
parents: 2938
diff changeset
21 --- a/src/Makefile.am 2012-10-01 12:52:07.000000000 -0400
4b484be8aaf3 update octave-2-fixes.patch
John W. Eaton <jwe@octave.org>
parents: 2938
diff changeset
22 +++ b/src/Makefile.am 2013-01-04 14:38:19.879050447 -0500
4b484be8aaf3 update octave-2-fixes.patch
John W. Eaton <jwe@octave.org>
parents: 2938
diff changeset
23 @@ -25,9 +25,10 @@
4b484be8aaf3 update octave-2-fixes.patch
John W. Eaton <jwe@octave.org>
parents: 2938
diff changeset
24 -I$(top_srcdir)/liboctave/array \
4b484be8aaf3 update octave-2-fixes.patch
John W. Eaton <jwe@octave.org>
parents: 2938
diff changeset
25 -I$(top_srcdir)/liboctave/cruft/misc \
2938
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
26 -I$(top_srcdir)/liboctave/numeric \
2942
4b484be8aaf3 update octave-2-fixes.patch
John W. Eaton <jwe@octave.org>
parents: 2938
diff changeset
27 + -I$(top_srcdir)/liboctave/system \
2938
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28 -I$(top_srcdir)/liboctave/util \
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
29 -I$(top_srcdir)/libinterp \
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30 - -I$(top_builddir)/libinterp/interpfcn \
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
31 + -I$(top_builddir)/libinterp/interpfcn -I$(top_srcdir)/libinterp/interpfcn \
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
32 -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
33
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
34 AM_CFLAGS += $(WARN_CFLAGS)
2943
18b9e08886d1 also patch Octave's src/Makefile.in
John W. Eaton <jwe@octave.org>
parents: 2942
diff changeset
35 --- a/src/Makefile.in 2013-01-04 15:50:45.019717585 -0500
18b9e08886d1 also patch Octave's src/Makefile.in
John W. Eaton <jwe@octave.org>
parents: 2942
diff changeset
36 +++ b/src/Makefile.in 2013-01-02 19:19:08.000000000 -0500
18b9e08886d1 also patch Octave's src/Makefile.in
John W. Eaton <jwe@octave.org>
parents: 2942
diff changeset
37 @@ -1841,10 +1841,9 @@
18b9e08886d1 also patch Octave's src/Makefile.in
John W. Eaton <jwe@octave.org>
parents: 2942
diff changeset
38 -I$(top_srcdir)/liboctave/array \
18b9e08886d1 also patch Octave's src/Makefile.in
John W. Eaton <jwe@octave.org>
parents: 2942
diff changeset
39 -I$(top_srcdir)/liboctave/cruft/misc \
18b9e08886d1 also patch Octave's src/Makefile.in
John W. Eaton <jwe@octave.org>
parents: 2942
diff changeset
40 -I$(top_srcdir)/liboctave/numeric \
18b9e08886d1 also patch Octave's src/Makefile.in
John W. Eaton <jwe@octave.org>
parents: 2942
diff changeset
41 - -I$(top_srcdir)/liboctave/system \
18b9e08886d1 also patch Octave's src/Makefile.in
John W. Eaton <jwe@octave.org>
parents: 2942
diff changeset
42 -I$(top_srcdir)/liboctave/util \
18b9e08886d1 also patch Octave's src/Makefile.in
John W. Eaton <jwe@octave.org>
parents: 2942
diff changeset
43 -I$(top_srcdir)/libinterp \
18b9e08886d1 also patch Octave's src/Makefile.in
John W. Eaton <jwe@octave.org>
parents: 2942
diff changeset
44 - -I$(top_builddir)/libinterp/interpfcn -I$(top_srcdir)/libinterp/interpfcn \
18b9e08886d1 also patch Octave's src/Makefile.in
John W. Eaton <jwe@octave.org>
parents: 2942
diff changeset
45 + -I$(top_builddir)/libinterp/interpfcn \
18b9e08886d1 also patch Octave's src/Makefile.in
John W. Eaton <jwe@octave.org>
parents: 2942
diff changeset
46 -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu
18b9e08886d1 also patch Octave's src/Makefile.in
John W. Eaton <jwe@octave.org>
parents: 2942
diff changeset
47
18b9e08886d1 also patch Octave's src/Makefile.in
John W. Eaton <jwe@octave.org>
parents: 2942
diff changeset
48 EXTRA_DIST = \
2938
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
49 diff --git a/src/main-cli.cc b/src/main-cli.cc
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
50 --- a/src/main-cli.cc
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
51 +++ b/src/main-cli.cc
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
52 @@ -26,12 +26,15 @@
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
53
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
54 #include "defaults.h"
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
55 #include "octave.h"
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
56 +#include "sysdep.h"
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
57
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
58 int
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
59 main (int argc, char **argv)
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
60 {
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
61 octave_process_command_line (argc, argv);
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
62
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
63 + sysdep_init ();
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
64 +
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
65 install_defaults ();
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
66
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
67 octave_initialize_interpreter (argc, argv, 0);
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
68 diff --git a/src/main.cc b/src/main.cc
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
69 --- a/src/main.cc
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
70 +++ b/src/main.cc
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
71 @@ -27,6 +27,7 @@
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
72 #include "defaults.h"
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
73 #include "octave.h"
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
74 #include "octave-gui.h"
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
75 +#include "sysdep.h"
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
76
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
77 int
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
78 main (int argc, char **argv)
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
79 @@ -35,6 +36,8 @@
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
80
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
81 octave_process_command_line (argc, argv);
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
82
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
83 + sysdep_init ();
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
84 +
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
85 install_defaults ();
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
86
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
87 if (octave_starting_gui ())