Mercurial > mxe-octave

annotate src/of-communications-1-fixes.patch @ 4733:1ecb1e67eaa1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/src-msys-dos2unix.mk: update checksum
author John Donoghue <john.donoghue@ieee.org>
date Sat, 09 Jun 2018 10:13:46 -0400
parents b5a28d770997
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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"
4059
b5a28d770997 of-communications, of-octcdf: update patch for default repo of octave
John Donoghue
parents: 4020
diff changeset
55 # HG changeset patch
b5a28d770997 of-communications, of-octcdf: update patch for default repo of octave
John Donoghue
parents: 4020
diff changeset
56 # User John Donoghue
b5a28d770997 of-communications, of-octcdf: update patch for default repo of octave
John Donoghue
parents: 4020
diff changeset
57 # Date 1448402937 18000
b5a28d770997 of-communications, of-octcdf: update patch for default repo of octave
John Donoghue
parents: 4020
diff changeset
58 # Tue Nov 24 17:08:57 2015 -0500
b5a28d770997 of-communications, of-octcdf: update patch for default repo of octave
John Donoghue
parents: 4020
diff changeset
59 # Node ID e8b6bae07002b9e94bfc104b1e844963ccaa5f41
b5a28d770997 of-communications, of-octcdf: update patch for default repo of octave
John Donoghue
parents: 4020
diff changeset
60 # Parent eeb20b3c6074e8932e40b14c9f99985340ceeca5
b5a28d770997 of-communications, of-octcdf: update patch for default repo of octave
John Donoghue
parents: 4020
diff changeset
61 define OV_REP_TYPE it it is not defined (Bug #46521)
b5a28d770997 of-communications, of-octcdf: update patch for default repo of octave
John Donoghue
parents: 4020
diff changeset
62
b5a28d770997 of-communications, of-octcdf: update patch for default repo of octave
John Donoghue
parents: 4020
diff changeset
63 * src/ov-galois.h: define OV_REP_TYPE if not defined already
b5a28d770997 of-communications, of-octcdf: update patch for default repo of octave
John Donoghue
parents: 4020
diff changeset
64
b5a28d770997 of-communications, of-octcdf: update patch for default repo of octave
John Donoghue
parents: 4020
diff changeset
65 diff -r eeb20b3c6074 -r e8b6bae07002 src/ov-galois.h
b5a28d770997 of-communications, of-octcdf: update patch for default repo of octave
John Donoghue
parents: 4020
diff changeset
66 --- a/src/ov-galois.h Thu Sep 03 13:19:03 2015 -0400
b5a28d770997 of-communications, of-octcdf: update patch for default repo of octave
John Donoghue
parents: 4020
diff changeset
67 +++ b/src/ov-galois.h Tue Nov 24 17:08:57 2015 -0500
b5a28d770997 of-communications, of-octcdf: update patch for default repo of octave
John Donoghue
parents: 4020
diff changeset
68 @@ -44,6 +44,10 @@
b5a28d770997 of-communications, of-octcdf: update patch for default repo of octave
John Donoghue
parents: 4020
diff changeset
69 #endif
b5a28d770997 of-communications, of-octcdf: update patch for default repo of octave
John Donoghue
parents: 4020
diff changeset
70 #endif
b5a28d770997 of-communications, of-octcdf: update patch for default repo of octave
John Donoghue
parents: 4020
diff changeset
71
b5a28d770997 of-communications, of-octcdf: update patch for default repo of octave
John Donoghue
parents: 4020
diff changeset
72 +#if ! defined (OV_REP_TYPE)
b5a28d770997 of-communications, of-octcdf: update patch for default repo of octave
John Donoghue
parents: 4020
diff changeset
73 +# define OV_REP_TYPE octave_base_value
b5a28d770997 of-communications, of-octcdf: update patch for default repo of octave
John Donoghue
parents: 4020
diff changeset
74 +#endif
b5a28d770997 of-communications, of-octcdf: update patch for default repo of octave
John Donoghue
parents: 4020
diff changeset
75 +
b5a28d770997 of-communications, of-octcdf: update patch for default repo of octave
John Donoghue
parents: 4020
diff changeset
76 class octave_value_list;
b5a28d770997 of-communications, of-octcdf: update patch for default repo of octave
John Donoghue
parents: 4020
diff changeset
77 class tree_walker;
b5a28d770997 of-communications, of-octcdf: update patch for default repo of octave
John Donoghue
parents: 4020
diff changeset
78