rpms/swig
7
0
Fork 0
Code Issues Pull Requests Releases Activity
d0077f8075
swig/swig-3.0.11_octave42.patch

749 lines
26 KiB
Diff
Raw Blame History

Index: swig-3.0.11/.travis.yml
===================================================================
--- swig-3.0.11.orig/.travis.yml
+++ swig-3.0.11/.travis.yml
@@ -77,13 +77,19 @@ matrix:
dist: trusty
- compiler: gcc
os: linux
- env: SWIGLANG=octave SWIGJOBS=-j2 # 3.2
+ env: SWIGLANG=octave SWIGJOBS=-j2 # 3.8
+ sudo: required
+ dist: trusty
- compiler: gcc
os: linux
- env: SWIGLANG=octave SWIGJOBS=-j2 VER=3.8
+ env: SWIGLANG=octave SWIGJOBS=-j2 VER=4.0
+ sudo: required
+ dist: trusty
- compiler: gcc
os: linux
- env: SWIGLANG=octave SWIGJOBS=-j2 VER=4.0
+ env: SWIGLANG=octave SWIGJOBS=-j2 VER=4.2
+ sudo: required
+ dist: trusty
- compiler: gcc
os: linux
env: SWIGLANG=perl5
Index: swig-3.0.11/CHANGES.current
===================================================================
--- swig-3.0.11.orig/CHANGES.current
+++ swig-3.0.11/CHANGES.current
@@ -4,6 +4,31 @@ See the RELEASENOTES file for a summary
Issue # numbers mentioned below can be found on Github. For more details, add
the issue number to the end of the URL: https://github.com/swig/swig/issues/
+
+Backported from https://github.com/swig/swig/pull/875
+=====================================================
+
+2016-12-31: kwwette
+ [Octave] add support for version 4.2.0
+ - C++11 compiler is required to compile examples/test suite
+ - Octave has dropped support for << and >> operators, so SWIG now
+ ignores them
+ - The Octave error() function now raises C++ exceptions to propagate
+ Octave errors, so %exception directives may need to be modified.
+ For convenience the SWIG_RETHROW_OCTAVE_EXCEPTIONS macro can be used
+ to rethrow any Octave exceptions for Octave itself to handle, e.g.:
+
+ try {
+ $action // may call error()
+ }
+ SWIG_RETHROW_OCTAVE_EXCEPTIONS // error() exceptions are rethrown
+ catch(...) {
+ ... // all other exceptions
+ }
+
+ *** POTENTIAL INCOMPATIBILITY ***
+
+
Version 3.0.11 (29 Dec 2016)
============================
Index: swig-3.0.11/Doc/Manual/Octave.html
===================================================================
--- swig-3.0.11.orig/Doc/Manual/Octave.html
+++ swig-3.0.11/Doc/Manual/Octave.html
@@ -64,8 +64,15 @@ Also, there are a dozen or so examples i
<p>
-As of SWIG 3.0.7, the Octave module is regularly tested with Octave versions 3.2.4, 3.8.1, and 4.0.0.
-Use of older Octave versions is not recommended, as these versions are no longer tested with SWIG.
+SWIG is regularly tested against the following versions of Octave: 3.8, 4.0, 4.2.
+</p>
+
+<p>
+Every effort is made to maintain backward compatibility with older versions of Octave.
+This cannot be guaranteed however, as in recent times new Octave releases have required nontrivial updates to SWIG, which may break backward compatibility for older Octave versions against which SWIG is not regularly tested.
+</p>
+
+<p>
The SWIG runtime exports the function <tt>swig_octave_prereq()</tt> for checking the version of Octave.
</p>
Index: swig-3.0.11/Examples/test-suite/exception_order.i
===================================================================
--- swig-3.0.11.orig/Examples/test-suite/exception_order.i
+++ swig-3.0.11/Examples/test-suite/exception_order.i
@@ -23,7 +23,17 @@
user's throw declarations.
*/
-#if defined(SWIGUTL)
+#if defined(SWIGOCTAVE)
+%exception {
+ try {
+ $action
+ }
+ SWIG_RETHROW_OCTAVE_EXCEPTIONS
+ catch(...) {
+ SWIG_exception(SWIG_RuntimeError,"postcatch unknown");
+ }
+}
+#elif defined(SWIGUTL)
%exception {
try {
$action
Index: swig-3.0.11/Lib/octave/exception.i
===================================================================
--- swig-3.0.11.orig/Lib/octave/exception.i
+++ swig-3.0.11/Lib/octave/exception.i
@@ -1,6 +1,14 @@
%include <typemaps/exception.swg>
-
%insert("runtime") {
%define_as(SWIG_exception(code, msg), %block(%error(code, msg); SWIG_fail; ))
}
+
+%define SWIG_RETHROW_OCTAVE_EXCEPTIONS
+ /* rethrow any exceptions thrown by Octave */
+%#if SWIG_OCTAVE_PREREQ(4,2,0)
+ catch (octave::execution_exception& _e) { throw; }
+ catch (octave::exit_exception& _e) { throw; }
+ catch (octave::interrupt_exception& _e) { throw; }
+%#endif
+%enddef
Index: swig-3.0.11/Lib/octave/octopers.swg
===================================================================
--- swig-3.0.11.orig/Lib/octave/octopers.swg
+++ swig-3.0.11/Lib/octave/octopers.swg
@@ -25,8 +25,6 @@
// __div__ a / b
// __pow__ a ^ b
// __ldiv__ a \ b
-// __lshift__ a << b
-// __rshift__ a >> b
// __lt__ a < b
// __le__ a <= b
// __eq__ a == b
@@ -51,8 +49,6 @@
%rename(__mul__) *::operator*;
%rename(__div__) *::operator/;
%rename(__mod__) *::operator%;
-%rename(__lshift__) *::operator<<;
-%rename(__rshift__) *::operator>>;
%rename(__el_and__) *::operator&&;
%rename(__el_or__) *::operator||;
%rename(__xor__) *::operator^;
@@ -84,5 +80,7 @@
// Ignored operators
%ignoreoperator(EQ) operator=;
%ignoreoperator(ARROWSTAR) operator->*;
+%ignoreoperator(LSHIFT) operator<<;
+%ignoreoperator(RSHIFT) operator>>;
#endif /* __cplusplus */
Index: swig-3.0.11/Lib/octave/octrun.swg
===================================================================
--- swig-3.0.11.orig/Lib/octave/octrun.swg
+++ swig-3.0.11/Lib/octave/octrun.swg
@@ -1,87 +1,3 @@
-
-#include <octave/version.h>
-
-// Macro for enabling features which require Octave version >= major.minor.patch
-#define SWIG_OCTAVE_PREREQ(major, minor, patch) \
- ( (OCTAVE_MAJOR_VERSION<<16) + (OCTAVE_MINOR_VERSION<<8) + OCTAVE_PATCH_VERSION >= ((major)<<16) + ((minor)<<8) + (patch) )
-
-// Reconstruct Octave major, minor, and patch versions for releases prior to 3.8.1
-#if !defined(OCTAVE_MAJOR_VERSION)
-
-# if !defined(OCTAVE_API_VERSION_NUMBER)
-
-// Hack to distinguish between Octave 3.8.0, which removed OCTAVE_API_VERSION_NUMBER but did not yet
-// introduce OCTAVE_MAJOR_VERSION, and Octave <= 3.2, which did not define OCTAVE_API_VERSION_NUMBER
-# include <octave/ov.h>
-# if defined(octave_ov_h)
-# define OCTAVE_MAJOR_VERSION 3
-# define OCTAVE_MINOR_VERSION 8
-# define OCTAVE_PATCH_VERSION 0
-# else
-
-// Hack to distinguish between Octave 3.2 and earlier versions, before OCTAVE_API_VERSION_NUMBER existed
-# define ComplexLU __ignore
-# include <octave/CmplxLU.h>
-# undef ComplexLU
-# if defined(octave_Complex_LU_h)
-
-// We know only that this version is prior to Octave 3.2, i.e. OCTAVE_API_VERSION_NUMBER < 37
-# define OCTAVE_MAJOR_VERSION 3
-# define OCTAVE_MINOR_VERSION 1
-# define OCTAVE_PATCH_VERSION 99
-
-# else
-
-// OCTAVE_API_VERSION_NUMBER == 37
-# define OCTAVE_MAJOR_VERSION 3
-# define OCTAVE_MINOR_VERSION 2
-# define OCTAVE_PATCH_VERSION 0
-
-# endif // defined(octave_Complex_LU_h)
-
-# endif // defined(octave_ov_h)
-
-// Correlation between Octave API and version numbers extracted from Octave's
-// ChangeLogs; version is the *earliest* released Octave with that API number
-# elif OCTAVE_API_VERSION_NUMBER >= 48
-# define OCTAVE_MAJOR_VERSION 3
-# define OCTAVE_MINOR_VERSION 6
-# define OCTAVE_PATCH_VERSION 0
-
-# elif OCTAVE_API_VERSION_NUMBER >= 45
-# define OCTAVE_MAJOR_VERSION 3
-# define OCTAVE_MINOR_VERSION 4
-# define OCTAVE_PATCH_VERSION 1
-
-# elif OCTAVE_API_VERSION_NUMBER >= 42
-# define OCTAVE_MAJOR_VERSION 3
-# define OCTAVE_MINOR_VERSION 3
-# define OCTAVE_PATCH_VERSION 54
-
-# elif OCTAVE_API_VERSION_NUMBER >= 41
-# define OCTAVE_MAJOR_VERSION 3
-# define OCTAVE_MINOR_VERSION 3
-# define OCTAVE_PATCH_VERSION 53
-
-# elif OCTAVE_API_VERSION_NUMBER >= 40
-# define OCTAVE_MAJOR_VERSION 3
-# define OCTAVE_MINOR_VERSION 3
-# define OCTAVE_PATCH_VERSION 52
-
-# elif OCTAVE_API_VERSION_NUMBER >= 39
-# define OCTAVE_MAJOR_VERSION 3
-# define OCTAVE_MINOR_VERSION 3
-# define OCTAVE_PATCH_VERSION 51
-
-# else // OCTAVE_API_VERSION_NUMBER == 38
-# define OCTAVE_MAJOR_VERSION 3
-# define OCTAVE_MINOR_VERSION 3
-# define OCTAVE_PATCH_VERSION 50
-
-# endif // !defined(OCTAVE_API_VERSION_NUMBER)
-
-#endif // !defined(OCTAVE_MAJOR_VERSION)
-
#if !SWIG_OCTAVE_PREREQ(3,2,0)
#define SWIG_DEFUN(cname, wname, doc) DEFUNX_DLD(#cname, wname, FS ## cname, args, nargout, doc)
#else
@@ -824,6 +740,24 @@ SWIGRUNTIME void swig_acquire_ownership_
return ret.scalar_value();
}
+#if SWIG_OCTAVE_PREREQ(4,2,0)
+ virtual octave_value as_double(void) const {
+ octave_value ret;
+ if (!dispatch_unary_op("__float__", ret)) {
+ error("__float__ method not defined");
+ }
+ return ret.as_double();
+ }
+
+ virtual octave_value as_single(void) const {
+ octave_value ret;
+ if (!dispatch_unary_op("__float__", ret)) {
+ error("__float__ method not defined");
+ }
+ return ret.as_single();
+ }
+#endif
+
#if SWIG_OCTAVE_PREREQ(3,8,0)
virtual octave_value map(octave_base_value::unary_mapper_t umap) const {
const std::string opname = std::string("__") + octave_base_value::get_umap_name(umap) + std::string("__");
@@ -1092,6 +1026,14 @@ SWIGRUNTIME void swig_acquire_ownership_
virtual double scalar_value(bool frc_str_conv = false) const
{ return ptr->scalar_value(frc_str_conv); }
+#if SWIG_OCTAVE_PREREQ(4,2,0)
+ virtual octave_value as_double(void) const
+ { return ptr->as_double(); }
+
+ virtual octave_value as_single(void) const
+ { return ptr->as_single(); }
+#endif
+
#if SWIG_OCTAVE_PREREQ(3,8,0)
virtual octave_value map(octave_base_value::unary_mapper_t umap) const
{ return ptr->map(umap); }
@@ -1340,8 +1282,10 @@ octave_value_typeinfo::register_binary_o
swig_binary_op(div);
swig_binary_op(pow);
swig_binary_op(ldiv);
+#if !SWIG_OCTAVE_PREREQ(4,2,0)
swig_binary_op(lshift);
swig_binary_op(rshift);
+#endif
swig_binary_op(lt);
swig_binary_op(le);
swig_binary_op(eq);
@@ -1371,8 +1315,10 @@ octave_value_typeinfo::register_binary_o
swigreg_binary_op(div);
swigreg_binary_op(pow);
swigreg_binary_op(ldiv);
+#if !SWIG_OCTAVE_PREREQ(4,2,0)
swigreg_binary_op(lshift);
swigreg_binary_op(rshift);
+#endif
swigreg_binary_op(lt);
swigreg_binary_op(le);
swigreg_binary_op(eq);
Index: swig-3.0.11/Lib/octave/octruntime.swg
===================================================================
--- swig-3.0.11.orig/Lib/octave/octruntime.swg
+++ swig-3.0.11/Lib/octave/octruntime.swg
@@ -1,7 +1,93 @@
%insert(runtime) %{
+
#include <cstdlib>
#include <iostream>
+
#include <octave/oct.h>
+#include <octave/version.h>
+
+// Macro for enabling features which require Octave version >= major.minor.patch
+// - Use (OCTAVE_PATCH_VERSION + 0) to handle both '<digit>' (released) and '<digit>+' (in development) patch numbers
+#define SWIG_OCTAVE_PREREQ(major, minor, patch) \
+ ( (OCTAVE_MAJOR_VERSION<<16) + (OCTAVE_MINOR_VERSION<<8) + (OCTAVE_PATCH_VERSION + 0) >= ((major)<<16) + ((minor)<<8) + (patch) )
+
+// Reconstruct Octave major, minor, and patch versions for releases prior to 3.8.1
+#if !defined(OCTAVE_MAJOR_VERSION)
+
+# if !defined(OCTAVE_API_VERSION_NUMBER)
+
+// Hack to distinguish between Octave 3.8.0, which removed OCTAVE_API_VERSION_NUMBER but did not yet
+// introduce OCTAVE_MAJOR_VERSION, and Octave <= 3.2, which did not define OCTAVE_API_VERSION_NUMBER
+# include <octave/ov.h>
+# if defined(octave_ov_h)
+# define OCTAVE_MAJOR_VERSION 3
+# define OCTAVE_MINOR_VERSION 8
+# define OCTAVE_PATCH_VERSION 0
+# else
+
+// Hack to distinguish between Octave 3.2 and earlier versions, before OCTAVE_API_VERSION_NUMBER existed
+# define ComplexLU __ignore
+# include <octave/CmplxLU.h>
+# undef ComplexLU
+# if defined(octave_Complex_LU_h)
+
+// We know only that this version is prior to Octave 3.2, i.e. OCTAVE_API_VERSION_NUMBER < 37
+# define OCTAVE_MAJOR_VERSION 3
+# define OCTAVE_MINOR_VERSION 1
+# define OCTAVE_PATCH_VERSION 99
+
+# else
+
+// OCTAVE_API_VERSION_NUMBER == 37
+# define OCTAVE_MAJOR_VERSION 3
+# define OCTAVE_MINOR_VERSION 2
+# define OCTAVE_PATCH_VERSION 0
+
+# endif // defined(octave_Complex_LU_h)
+
+# endif // defined(octave_ov_h)
+
+// Correlation between Octave API and version numbers extracted from Octave's
+// ChangeLogs; version is the *earliest* released Octave with that API number
+# elif OCTAVE_API_VERSION_NUMBER >= 48
+# define OCTAVE_MAJOR_VERSION 3
+# define OCTAVE_MINOR_VERSION 6
+# define OCTAVE_PATCH_VERSION 0
+
+# elif OCTAVE_API_VERSION_NUMBER >= 45
+# define OCTAVE_MAJOR_VERSION 3
+# define OCTAVE_MINOR_VERSION 4
+# define OCTAVE_PATCH_VERSION 1
+
+# elif OCTAVE_API_VERSION_NUMBER >= 42
+# define OCTAVE_MAJOR_VERSION 3
+# define OCTAVE_MINOR_VERSION 3
+# define OCTAVE_PATCH_VERSION 54
+
+# elif OCTAVE_API_VERSION_NUMBER >= 41
+# define OCTAVE_MAJOR_VERSION 3
+# define OCTAVE_MINOR_VERSION 3
+# define OCTAVE_PATCH_VERSION 53
+
+# elif OCTAVE_API_VERSION_NUMBER >= 40
+# define OCTAVE_MAJOR_VERSION 3
+# define OCTAVE_MINOR_VERSION 3
+# define OCTAVE_PATCH_VERSION 52
+
+# elif OCTAVE_API_VERSION_NUMBER >= 39
+# define OCTAVE_MAJOR_VERSION 3
+# define OCTAVE_MINOR_VERSION 3
+# define OCTAVE_PATCH_VERSION 51
+
+# else // OCTAVE_API_VERSION_NUMBER == 38
+# define OCTAVE_MAJOR_VERSION 3
+# define OCTAVE_MINOR_VERSION 3
+# define OCTAVE_PATCH_VERSION 50
+
+# endif // !defined(OCTAVE_API_VERSION_NUMBER)
+
+#endif // !defined(OCTAVE_MAJOR_VERSION)
+
#include <octave/Cell.h>
#include <octave/dynamic-ld.h>
#include <octave/oct-env.h>
@@ -9,8 +95,16 @@
#include <octave/ov-scalar.h>
#include <octave/ov-fcn-handle.h>
#include <octave/parse.h>
+#if SWIG_OCTAVE_PREREQ(4,2,0)
+#include <octave/interpreter.h>
+#else
#include <octave/toplev.h>
+#endif
#include <octave/unwind-prot.h>
+#if SWIG_OCTAVE_PREREQ(4,2,0)
+#include <octave/call-stack.h>
+#endif
+
%}
%insert(runtime) "swigrun.swg";
@@ -24,27 +118,34 @@
static bool SWIG_init_user(octave_swig_type* module_ns);
SWIGINTERN bool SWIG_Octave_LoadModule(std::string name) {
- bool retn;
+ bool retn = false;
{
-#if !SWIG_OCTAVE_PREREQ(3,3,50)
+#if SWIG_OCTAVE_PREREQ(4,2,0)
+ octave::unwind_protect frame;
+ frame.protect_var(discard_error_messages); discard_error_messages = true;
+ frame.protect_var(discard_warning_messages); discard_warning_messages = true;
+#elif SWIG_OCTAVE_PREREQ(3,3,50)
+ unwind_protect frame;
+ frame.protect_var(error_state); error_state = 0;
+ frame.protect_var(warning_state); warning_state = 0;
+ frame.protect_var(discard_error_messages); discard_error_messages = true;
+ frame.protect_var(discard_warning_messages); discard_warning_messages = true;
+#else
unwind_protect::begin_frame("SWIG_Octave_LoadModule");
- unwind_protect_int(error_state);
- unwind_protect_int(warning_state);
- unwind_protect_bool(discard_error_messages);
- unwind_protect_bool(discard_warning_messages);
+ unwind_protect_int(error_state); error_state = 0;
+ unwind_protect_int(warning_state); warning_state = 0;
+ unwind_protect_bool(discard_error_messages); discard_error_messages = true;
+ unwind_protect_bool(discard_warning_messages); discard_warning_messages = true;
+#endif
+#if SWIG_OCTAVE_PREREQ(4,2,0)
+ try {
+ feval(name, octave_value_list(), 0);
+ retn = true;
+ } catch (octave::execution_exception&) { }
#else
- unwind_protect frame;
- frame.protect_var(error_state);
- frame.protect_var(warning_state);
- frame.protect_var(discard_error_messages);
- frame.protect_var(discard_warning_messages);
-#endif
- error_state = 0;
- warning_state = 0;
- discard_error_messages = true;
- discard_warning_messages = true;
feval(name, octave_value_list(), 0);
retn = (error_state == 0);
+#endif
#if !SWIG_OCTAVE_PREREQ(3,3,50)
unwind_protect::run_frame("SWIG_Octave_LoadModule");
#endif
@@ -56,31 +157,37 @@ SWIGINTERN bool SWIG_Octave_LoadModule(s
}
SWIGINTERN bool SWIG_Octave_InstallFunction(octave_function *octloadfcn, std::string name) {
- bool retn;
+ bool retn = false;
{
-#if !SWIG_OCTAVE_PREREQ(3,3,50)
- unwind_protect::begin_frame("SWIG_Octave_InstallFunction");
- unwind_protect_int(error_state);
- unwind_protect_int(warning_state);
- unwind_protect_bool(discard_error_messages);
- unwind_protect_bool(discard_warning_messages);
-#else
+#if SWIG_OCTAVE_PREREQ(4,2,0)
+ octave::unwind_protect frame;
+ frame.protect_var(discard_error_messages); discard_error_messages = true;
+ frame.protect_var(discard_warning_messages); discard_warning_messages = true;
+#elif SWIG_OCTAVE_PREREQ(3,3,50)
unwind_protect frame;
- frame.protect_var(error_state);
- frame.protect_var(warning_state);
- frame.protect_var(discard_error_messages);
- frame.protect_var(discard_warning_messages);
-#endif
- error_state = 0;
- warning_state = 0;
- discard_error_messages = true;
- discard_warning_messages = true;
+ frame.protect_var(error_state); error_state = 0;
+ frame.protect_var(warning_state); warning_state = 0;
+ frame.protect_var(discard_error_messages); discard_error_messages = true;
+ frame.protect_var(discard_warning_messages); discard_warning_messages = true;
+#else
+ unwind_protect::begin_frame("SWIG_Octave_LoadModule");
+ unwind_protect_int(error_state); error_state = 0;
+ unwind_protect_int(warning_state); warning_state = 0;
+ unwind_protect_bool(discard_error_messages); discard_error_messages = true;
+ unwind_protect_bool(discard_warning_messages); discard_warning_messages = true;
+#endif
octave_value_list args;
args.append(name);
args.append(octloadfcn->fcn_file_name());
- error_state = 0;
+#if SWIG_OCTAVE_PREREQ(4,2,0)
+ try {
+ feval("autoload", args, 0);
+ retn = true;
+ } catch (octave::execution_exception&) { }
+#else
feval("autoload", args, 0);
retn = (error_state == 0);
+#endif
#if !SWIG_OCTAVE_PREREQ(3,3,50)
unwind_protect::run_frame("SWIG_Octave_InstallFunction");
#endif
@@ -211,10 +318,11 @@ DEFUN_DLD( SWIG_name, args, nargout, SWI
// workaround to prevent octave seg-faulting on exit: set Octave exit function
// octave_exit to _Exit, which exits immediately without trying to cleanup memory.
- // definitely affects version 3.2.*, not sure about 3.3.*, seems to be fixed in
- // version 3.4.* and above. can be turned off with macro definition.
+ // definitely affecteds version 3.2.*, not sure about 3.3.*, seems to be fixed in
+ // version 3.4.*, but reappeared in 4.2.*, so turn on for all versions after 3.2.*.
+ // can be turned off with macro definition.
#ifndef SWIG_OCTAVE_NO_SEGFAULT_HACK
-#if SWIG_OCTAVE_PREREQ(3,2,0) && !SWIG_OCTAVE_PREREQ(3,4,1)
+#if SWIG_OCTAVE_PREREQ(3,2,0)
octave_exit = ::_Exit;
#endif
#endif
Index: swig-3.0.11/Lib/octave/std_wstring.i
===================================================================
--- /dev/null
+++ swig-3.0.11/Lib/octave/std_wstring.i
@@ -0,0 +1 @@
+%include <typemaps/std_string.swg>
Index: swig-3.0.11/Lib/typemaps/fragments.swg
===================================================================
--- swig-3.0.11.orig/Lib/typemaps/fragments.swg
+++ swig-3.0.11/Lib/typemaps/fragments.swg
@@ -177,9 +177,11 @@
* versions.
*
* Make sure namespace std exists to avoid compiler warnings.
+ *
+ * extern "C++" is required as this fragment can end up inside an extern "C" { } block
*/
namespace std { }
-template<typename T>
+extern "C++" template<typename T>
inline int SWIG_isfinite_func(T x) {
using namespace std;
return isfinite(x);
Index: swig-3.0.11/Tools/travis-linux-install.sh
===================================================================
--- swig-3.0.11.orig/Tools/travis-linux-install.sh
+++ swig-3.0.11/Tools/travis-linux-install.sh
@@ -64,7 +64,7 @@ case "$SWIGLANG" in
;;
"octave")
if [[ -z "$VER" ]]; then
- sudo apt-get -qq install octave3.2 octave3.2-headers
+ sudo apt-get -qq install liboctave-dev
else
sudo add-apt-repository -y ppa:kwwette/octaves
sudo apt-get -qq update
Index: swig-3.0.11/configure.ac
===================================================================
--- swig-3.0.11.orig/configure.ac
+++ swig-3.0.11/configure.ac
@@ -1018,30 +1018,77 @@ OCTAVE_SO=.oct
AC_ARG_WITH(octave, AS_HELP_STRING([--without-octave], [Disable Octave])
AS_HELP_STRING([--with-octave=path], [Set location of Octave executable]),[OCTAVEBIN="$withval"], [OCTAVEBIN="$alllang_default"])
-# First, check for "--without-octave" or "--with-octave=no".
+# Check for "--without-octave" or "--with-octave=no".
if test x"${OCTAVEBIN}" = xno; then
AC_MSG_NOTICE([Disabling Octave])
OCTAVE=
-# First figure out what the name of Octave is
+# Check for Octave; prefer command-line program "octave-cli" to (in newer versions) GUI program "octave"
elif test "x$OCTAVEBIN" = xyes; then
- AC_PATH_PROG(OCTAVE, [octave])
+ AC_PATH_PROG(OCTAVE, [octave-cli octave])
else
OCTAVE="$OCTAVEBIN"
fi
+# Check Octave options and version, and whether a C++11 compiler is required
if test -n "$OCTAVE"; then
- AC_MSG_CHECKING([for mkoctfile])
- mkoctfile="$(dirname $OCTAVE)/$(basename $OCTAVE | sed -e 's/octave/mkoctfile/')"
- AS_IF([test -x "${mkoctfile}"],[
- AC_MSG_RESULT([${mkoctfile}])
+
+ for octave_opt in --no-window-system --silent --norc --no-history; do
+ AC_MSG_CHECKING([if Octave option '${octave_opt}' is supported])
+ octave_out=`${OCTAVE} ${octave_opt} /dev/null 2>&1 | sed -n '1p' | sed -n '/unrecognized/p'`
+ AS_IF([test "x${octave_out}" = x],[
+ AC_MSG_RESULT([yes])
+ OCTAVE="${OCTAVE} ${octave_opt}"
+ ],[
+ AC_MSG_RESULT([no])
+ ])
+ done
+
+ AC_MSG_CHECKING([for Octave version])
+ octave_version=`${OCTAVE} --version 2>/dev/null | sed -n '1p' | sed -n 's/^.*version //p'`
+ AC_MSG_RESULT([${octave_version}])
+ AS_CASE([${octave_version}],
+ [*.*.*],[:],
+ [AC_MSG_ERROR([could not determine version of ${OCTAVE}])]
+ )
+
+ AC_MSG_CHECKING([if Octave requires a C++11 compiler])
+ OCTAVE_CXX11FLAGS=
+ AX_COMPARE_VERSION([${octave_version}],[ge],[4.2.0],[
+ AC_MSG_RESULT([yes])
+ AC_LANG_PUSH([C++])
+ CXXFLAGS_SAVED=$CXXFLAGS
+ CXXFLAGS=
+ AX_CXX_COMPILE_STDCXX_11([noext], [nostop])
+ CXXFLAGS=$CXXFLAGS_SAVED
+ AC_LANG_POP([C++])
+ AC_MSG_CHECKING([for C++11 enabled compiler])
+ AS_IF([test "x${HAVE_CXX11_COMPILER}" = x],[
+ AC_MSG_RESULT([no, disabling Octave])
+ OCTAVE=
+ ],[
+ AC_MSG_RESULT([$HAVE_CXX11_COMPILER])
+ OCTAVE_CXX11FLAGS="${CXX11FLAGS}"
+ ])
],[
- AC_MSG_RESULT([not found, disabling Octave])
+ AC_MSG_RESULT([no])
+ ])
+
+fi
+
+# Check for required Octave helper program "mkoctfile"
+if test -n "$OCTAVE"; then
+ AC_PATH_PROG(mkoctfile, [mkoctfile], [], [$(dirname $OCTAVE)])
+ AS_IF([test "x${mkoctfile}" = x],[
+ AC_MSG_NOTICE([mkoctfile not found, disabling Octave])
OCTAVE=
])
fi
+
+# Check for Octave preprocessor/compiler/linker flags
if test -n "$OCTAVE"; then
+
AC_MSG_CHECKING([for Octave preprocessor flags])
OCTAVE_CPPFLAGS=
for var in CPPFLAGS INCFLAGS ALL_CXXFLAGS; do
@@ -1053,8 +1100,9 @@ if test -n "$OCTAVE"; then
done
done
AC_MSG_RESULT([$OCTAVE_CPPFLAGS])
+
AC_MSG_CHECKING([for Octave compiler flags])
- OCTAVE_CXXFLAGS=
+ OCTAVE_CXXFLAGS="${OCTAVE_CXX11FLAGS}"
for var in ALL_CXXFLAGS; do
for flag in `env - ${mkoctfile} -p ${var}`; do
case ${flag} in
@@ -1066,28 +1114,20 @@ if test -n "$OCTAVE"; then
save_CXXFLAGS="${CXXFLAGS}"
CXXFLAGS="-Werror -O0"
AC_COMPILE_IFELSE([
- AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],[])
+ AC_LANG_PROGRAM([],[])
],[
OCTAVE_CXXFLAGS="${OCTAVE_CXXFLAGS} -O0"
])
CXXFLAGS="${save_CXXFLAGS}"
AC_MSG_RESULT([$OCTAVE_CXXFLAGS])
+
AC_MSG_CHECKING([for Octave linker flags])
OCTAVE_LDFLAGS=
for var in RDYNAMIC_FLAG LFLAGS RLD_FLAG OCTAVE_LIBS LIBS; do
OCTAVE_LDFLAGS="${OCTAVE_LDFLAGS} "`env - ${mkoctfile} -p ${var}`
done
AC_MSG_RESULT([$OCTAVE_LDFLAGS])
- for octave_opt in --silent --norc --no-history --no-window-system; do
- AC_MSG_CHECKING([if Octave option '${octave_opt}' is supported])
- octave_out=`${OCTAVE} ${octave_opt} /dev/null 2>&1 | sed -n '1p' | sed -n '/unrecognized/p'`
- AS_IF([test "x${octave_out}" = x],[
- AC_MSG_RESULT([yes])
- OCTAVE="${OCTAVE} ${octave_opt}"
- ],[
- AC_MSG_RESULT([no])
- ])
- done
+
fi
AC_SUBST(OCTAVE)
Index: swig-3.0.11/Lib/go/std_wstring.i
===================================================================
--- /dev/null
+++ swig-3.0.11/Lib/go/std_wstring.i
@@ -0,0 +1 @@
+%include <typemaps/std_string.swg>
Index: swig-3.0.11/Lib/lua/std_wstring.i
===================================================================
--- /dev/null
+++ swig-3.0.11/Lib/lua/std_wstring.i
@@ -0,0 +1 @@
+%include <typemaps/std_string.swg>
Index: swig-3.0.11/Lib/perl5/std_wstring.i
===================================================================
--- /dev/null
+++ swig-3.0.11/Lib/perl5/std_wstring.i
@@ -0,0 +1 @@
+%include <typemaps/std_string.swg>
Index: swig-3.0.11/Lib/php/std_wstring.i
===================================================================
--- /dev/null
+++ swig-3.0.11/Lib/php/std_wstring.i
@@ -0,0 +1 @@
+%include <typemaps/std_string.swg>
Index: swig-3.0.11/Lib/r/std_wstring.i
===================================================================
--- /dev/null
+++ swig-3.0.11/Lib/r/std_wstring.i
@@ -0,0 +1 @@
+%include <typemaps/std_string.swg>
Reference in New Issue View Git Blame Copy Permalink