Mercurial > mxe-octave
changeset 4424:bf58ac7af95d
of-database: add patch for dev octave
* src/of-database-2-dev-fixes.patch: new file
* dist-files.mk: add of-database-2-dev-fixes.patch
* src/of-database/mk: call src/bootstrap
| author | John D |
|---|---|
| date | Fri, 14 Jul 2017 12:00:29 -0400 |
| parents | 8c4a121b1e71 |
| children | 8c51e3a9d984 |
| files | dist-files.mk src/of-database-2-dev-fixes.patch src/of-database.mk |
| diffstat | 3 files changed, 47 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Fri Jul 14 11:57:08 2017 -0400 +++ b/dist-files.mk Fri Jul 14 12:00:29 2017 -0400 @@ -446,6 +446,7 @@ of-control.mk \ of-data-smoothing.mk \ of-database-1-cross-fixes.patch \ + of-database-2-dev-fixes.patch \ of-database.mk \ of-dataframe-1-fixes.patch \ of-dataframe.mk \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-database-2-dev-fixes.patch Fri Jul 14 12:00:29 2017 -0400 @@ -0,0 +1,44 @@ +diff -r d85ae875cc23 src/bytea2var.cc +--- a/src/bytea2var.cc Tue Mar 28 11:33:49 2017 +0200 ++++ b/src/bytea2var.cc Thu Jul 13 16:47:45 2017 -0400 +@@ -94,7 +94,11 @@ + + flt_fmt = mopt_digit_to_float_format (tmp); + ++#ifdef HAVE_OCTAVE_MACH_INFO ++ if (flt_fmt == octave::mach_info::flt_fmt_unknown) ++#else + if (flt_fmt == oct_mach_info::flt_fmt_unknown) ++#endif + { + error ("%s: unrecognized binary format", fname.c_str ()); + +diff -r d85ae875cc23 src/config.h.in +--- a/src/config.h.in Tue Mar 28 11:33:49 2017 +0200 ++++ b/src/config.h.in Thu Jul 13 16:47:45 2017 -0400 +@@ -4,3 +4,6 @@ + /* Define as 1 if liboctinterp has + 'verror (octave_execution_exception&, const char *, va_list)'. */ + #undef HAVE_OCTAVE_VERROR_ARG_EXC ++ ++/* Define as 1 if we have octave::mach_info */ ++#undef HAVE_OCTAVE_MACH_INFO +diff -r d85ae875cc23 src/configure.ac +--- a/src/configure.ac Tue Mar 28 11:33:49 2017 +0200 ++++ b/src/configure.ac Thu Jul 13 16:47:45 2017 -0400 +@@ -102,6 +102,15 @@ + [verror (e, "test", args);]])], + [AC_DEFINE([HAVE_OCTAVE_VERROR_ARG_EXC], 1)]) + ++## look for newer octave::mach_info in octave ++LIBS="-loctave $LIBS" ++AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM([[#include <octave/oct.h>] ++ [#include <octave/byte-swap.h>]], ++ [[octave::mach_info::native_float_format();]])], ++ [AC_DEFINE([HAVE_OCTAVE_MACH_INFO], 1)]) ++ ++ + LIBS=$TLIBS + LDFLAGS=$TLDFLAGS + CXXFLAGS=$TCXXFLAGS
--- a/src/of-database.mk Fri Jul 14 11:57:08 2017 -0400 +++ b/src/of-database.mk Fri Jul 14 12:00:29 2017 -0400 @@ -19,10 +19,12 @@ ifeq ($(MXE_SYSTEM)$(MXE_NATIVE_MINGW_BUILD),mingwno) define $(PKG)_BUILD + cd '$(1)/src' && source ./bootstrap $(OCTAVE_FORGE_PKG_BUILD,$(1),$(2),$(3),"BUILD_CXX=g++")) endef else define $(PKG)_BUILD + cd '$(1)/src' && source ./bootstrap $(OCTAVE_FORGE_PKG_BUILD) endef endif