Mercurial > mxe-octave
annotate src/of-communications-1-fixes.patch @ 4020:46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
* src/of-communications-1-fixes.patch: new file
* src/of-communications.mk: call autoconfigure
* dist-files.mk: add of-communications-1-fixes.patch
author | John Donoghue |
---|---|
date | Fri, 04 Sep 2015 10:06:02 -0400 |
parents | |
children | b5a28d770997 |
rev | line source |
---|---|
4020
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
1 # HG changeset patch |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
2 # User John Donoghue |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
3 # Date 1441300743 14400 |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
4 # Thu Sep 03 13:19:03 2015 -0400 |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
5 # Node ID eeb20b3c6074e8932e40b14c9f99985340ceeca5 |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
6 # Parent dedf92d61d33525da3f71a635979c447defb438a |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
7 Check for ls-oct-ascii.h, ls-oct-text.h (Bug #45856) |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
8 |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
9 src/configure.ac: check for ls-oct-ascii.h, ls-oct-text.h and set HAVE_XXXX variables accordingly. |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
10 |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
11 src/ov-galois.cc: include either ls-oct-ascii.h, ls-oct-text.h dependong on HAVE_XXXX variables |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
12 |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
13 diff -r dedf92d61d33 -r eeb20b3c6074 src/configure.ac |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
14 --- a/src/configure.ac Sat Apr 04 12:20:33 2015 -0400 |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
15 +++ b/src/configure.ac Thu Sep 03 13:19:03 2015 -0400 |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
16 @@ -99,5 +99,21 @@ |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
17 PKG_CPPFLAGS="$PKG_CPPFLAGS -DHAVE_OCTAVE_BASE_VALUE_PRINT_CONST=1" |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
18 fi |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
19 |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
20 +comm_save_CXXFLAGS=$CXXFLAGS |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
21 +CXXFLAGS="$CXXFLAGS $comm_CXXFLAGS" |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
22 +AC_LANG_PUSH(C++) |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
23 +AC_CHECK_HEADER([octave/ls-oct-ascii.h], [PKG_CPPFLAGS="$PKG_CPPFLAGS -DHAVE_OCTAVE_ASCII_H=1"], [], |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
24 +[ |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
25 +#include <octave/config.h> |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
26 +#incude <octave/ov.h> |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
27 +]) |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
28 +AC_CHECK_HEADER([octave/ls-oct-text.h], [PKG_CPPFLAGS="$PKG_CPPFLAGS -DHAVE_OCTAVE_TEXT_H=1"], [], |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
29 +[ |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
30 +#include <octave/config.h> |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
31 +#include <octave/ov.h> |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
32 +]) |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
33 +AC_LANG_POP(C++) |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
34 +CXXFLAGS=$comm_save_CXXFLAGS |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
35 + |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
36 AC_CONFIG_FILES([Makefile]) |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
37 AC_OUTPUT |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
38 diff -r dedf92d61d33 -r eeb20b3c6074 src/ov-galois.cc |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
39 --- a/src/ov-galois.cc Sat Apr 04 12:20:33 2015 -0400 |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
40 +++ b/src/ov-galois.cc Thu Sep 03 13:19:03 2015 -0400 |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
41 @@ -30,7 +30,12 @@ |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
42 #include <octave/ov.h> |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
43 #include <octave/pr-output.h> |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
44 |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
45 -#include <octave/ls-oct-ascii.h> |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
46 + |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
47 +#if defined(HAVE_OCTAVE_TEXT_H) |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
48 +# include <octave/ls-oct-text.h> |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
49 +#else |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
50 +# include <octave/ls-oct-ascii.h> |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
51 +#endif |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
52 |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
53 #include "galois.h" |
46c6ddb14417
of-communications: add patch to compile wih dev octave (Bug #45856)
John Donoghue
parents:
diff
changeset
|
54 #include "ov-galois.h" |