Mercurial > mxe-octave

changeset 3951:1cab2860069e release-4-0-0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stable-octave: update to 4.0.0
author John W. Eaton <jwe@octave.org>
date Wed, 27 May 2015 15:57:36 -0400
parents 4a4dbf79c313
children 6349e1b15144
files dist-files.mk src/stable-octave-1-gnulib-isatty.patch src/stable-octave-2-winbelloff.patch src/stable-octave-3-fixes.patch src/stable-octave.mk
diffstat 5 files changed, 17 insertions(+), 133 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Wed May 27 15:57:11 2015 -0400
+++ b/dist-files.mk	Wed May 27 15:57:36 2015 -0400
@@ -624,9 +624,6 @@
   src-msys-zip.mk \
   stable-octave-1-docinstall.patch \
   stable-octave-1-fixes.patch \
-  stable-octave-1-gnulib-isatty.patch \
-  stable-octave-2-winbelloff.patch \
-  stable-octave-3-fixes.patch \
   stable-octave.mk \
   suitesparse-1.patch \
   suitesparse.mk \
--- a/src/stable-octave-1-gnulib-isatty.patch	Wed May 27 15:57:11 2015 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-Patch based on savannah.gnu.org/bugs/?327623#attached
-
-diff -ur octave-3.8.2-rc2.orig/libgnu/isatty.c octave-3.8.2-rc2/libgnu/isatty.c
---- octave-3.8.2-rc2.orig/libgnu/isatty.c	2014-08-12 15:31:01.710229546 -0400
-+++ octave-3.8.2-rc2/libgnu/isatty.c	2014-08-12 15:41:15.603406658 -0400
-@@ -34,7 +34,13 @@
- 
- /* Optimized test whether a HANDLE refers to a console.
-    See <http://lists.gnu.org/archive/html/bug-gnulib/2009-08/msg00065.html>.  */
--#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3)
-+//#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3)
-+static BOOL
-+IsConsoleHandle(HANDLE h)
-+{
-+  DWORD mode;
-+  return GetConsoleMode(h, &mode) != 0;
-+}
- 
- #if HAVE_MSVC_INVALID_PARAMETER_HANDLER
- static int
-diff -ur octave-3.8.2-rc2.orig/libgnu/select.c octave-3.8.2-rc2/libgnu/select.c
---- octave-3.8.2-rc2.orig/libgnu/select.c	2014-08-12 15:31:01.704229427 -0400
-+++ octave-3.8.2-rc2/libgnu/select.c	2014-08-12 15:44:44.268552023 -0400
-@@ -84,7 +84,14 @@
- 
- /* Optimized test whether a HANDLE refers to a console.
-    See <http://lists.gnu.org/archive/html/bug-gnulib/2009-08/msg00065.html>.  */
--#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3)
-+//#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3)
-+static BOOL
-+IsConsoleHandle(HANDLE h)
-+{
-+  DWORD mode;
-+  return GetConsoleMode(h, &mode) != 0;
-+}
-+
- 
- static BOOL
- IsSocketHandle (HANDLE h)
--- a/src/stable-octave-2-winbelloff.patch	Wed May 27 15:57:11 2015 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-# HG changeset patch
-# User John Donoghue <john.donoghue@ieee.org>
-# Date 1406465631 14400
-#      Sun Jul 27 08:53:51 2014 -0400
-# Branch gui-release
-# Node ID b2c1093f8e4a7c5865155430184fa90bed5f0b4b
-# Parent  c6b89c4a9e63d8c65e1a6a1703138b2a6bc9c5a9
-Disable bell in Windows (Bug #42268)
-
-* scripts/startup/inputrc: if term=cygwin, set bell style to none
-
-diff -r c6b89c4a9e63 -r b2c1093f8e4a scripts/startup/inputrc
---- a/scripts/startup/inputrc	Wed Jul 23 08:52:42 2014 +0200
-+++ b/scripts/startup/inputrc	Sun Jul 27 08:53:51 2014 -0400
-@@ -24,3 +24,8 @@
- ## \C-q should still be available for quoted insert.
- 
- "\C-v": ""
-+
-+## In windows, disable audiable bell which is enabled by default
-+$if term=cygwin
-+   set bell-style none
-+$endif
--- a/src/stable-octave-3-fixes.patch	Wed May 27 15:57:11 2015 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-# HG changeset patch
-# User John W. Eaton <jwe@octave.org>
-# Date 1412519047 14400
-#      Sun Oct 05 10:24:07 2014 -0400
-# Branch stable
-# Node ID 3ffb8f53e94019084321d065390f4d4e215fd465
-# Parent  432ffa35de136a5dfd2a717a598750b62e6944f9
-use correct HDF5 size for octave_idx_type on Windows-64 (bug #43101)
-
-* ls-hdf5.h: Define H5T_NATIVE_IDX to H5T_NATIVE_INT64 when using
-64-bit indexing.
-
-diff --git a/libinterp/corefcn/ls-hdf5.h b/libinterp/corefcn/ls-hdf5.h
---- a/libinterp/corefcn/ls-hdf5.h
-+++ b/libinterp/corefcn/ls-hdf5.h
-@@ -204,7 +204,7 @@
-                       const char *attr_name, void *buf);
- 
- #ifdef USE_64_BIT_IDX_T
--#define H5T_NATIVE_IDX H5T_NATIVE_LONG
-+#define H5T_NATIVE_IDX H5T_NATIVE_INT64
- #else
- #define H5T_NATIVE_IDX H5T_NATIVE_INT
- #endif
-# HG changeset patch
-# User John W. Eaton <jwe@octave.org>
-# Date 1412520111 14400
-#      Sun Oct 05 10:41:51 2014 -0400
-# Branch stable
-# Node ID 0279c601b49ce5d539b1ae938e8ec562b63f1ced
-# Parent  3ffb8f53e94019084321d065390f4d4e215fd465
-compute for loop indices consistently with range element results
-
-* pt-eval.cc (tree_evaluator::visit_simple_for_command): Use
-Range::elem instead of compuiting elements directly.  This change
-appears to fix obscure test failures in eig.cc-tst on 64-bit Windows
-systems.  See also task #13313.
-
-diff --git a/libinterp/parse-tree/pt-eval.cc b/libinterp/parse-tree/pt-eval.cc
---- a/libinterp/parse-tree/pt-eval.cc
-+++ b/libinterp/parse-tree/pt-eval.cc
-@@ -336,21 +336,10 @@
-         Range rng = rhs.range_value ();
- 
-         octave_idx_type steps = rng.nelem ();
--        double b = rng.base ();
--        double increment = rng.inc ();
- 
-         for (octave_idx_type i = 0; i < steps; i++)
-           {
--            // Use multiplication here rather than declaring a
--            // temporary variable outside the loop and using
--            //
--            //   tmp_val += increment
--            //
--            // to avoid problems with limited precision.  Also, this
--            // is consistent with the way Range::matrix_value is
--            // implemented.
--
--            octave_value val (b + i * increment);
-+            octave_value val (rng.elem (i));
- 
-             ult.assign (octave_value::op_asn_eq, val);
- 
--- a/src/stable-octave.mk	Wed May 27 15:57:11 2015 -0400
+++ b/src/stable-octave.mk	Wed May 27 15:57:36 2015 -0400
@@ -3,15 +3,15 @@
 
 PKG             := stable-octave
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.8.2
-$(PKG)_CHECKSUM := 02c38e0f69bce4e6dd7be7d301898347085d9c2d
+$(PKG)_VERSION  := 4.0.0
+$(PKG)_CHECKSUM := 795c7ef1fb8d92f4cf9cae9eabba374a0328b1a9
 $(PKG)_SUBDIR   := octave-$($(PKG)_VERSION)
-$(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.bz2
+$(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := ftp://ftp.gnu.org/gnu/octave/$($(PKG)_FILE)
 ifeq ($(USE_SYSTEM_FONTCONFIG),no)
   $(PKG)_FONTCONFIG := fontconfig
 endif
-$(PKG)_DEPS     := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack osmesa pcre pstoedit qrupdate qscintilla qt readline suitesparse texinfo zlib
+$(PKG)_DEPS     := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack libsndfile osmesa pcre portaudio pstoedit qrupdate qscintilla qt readline suitesparse texinfo zlib
 ifeq ($(MXE_WINDOWS_BUILD),no)
   ifeq ($(USE_SYSTEM_X11_LIBS),no)
     $(PKG)_DEPS += x11 xext
@@ -88,6 +88,13 @@
   $(PKG)_EXTRA_CONFIGURE_OPTIONS += --with-x=no
 endif
 
+# if want binary packages and are cross compiling, then we need cross tools enabled
+ifeq ($(ENABLE_BINARY_PACKAGES),yes)
+  ifeq ($(MXE_NATIVE_BUILD),no)
+    $(PKG)_EXTRA_CONFIGURE_OPTIONS += --enable-cross-tools
+  endif
+endif
+
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package octave.' >&2;
     echo $($(PKG)_VERSION)
@@ -116,6 +123,7 @@
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$($(PKG)_PREFIX)' \
         --disable-silent-rules \
+        --enable-install-build-logs \
         $($(PKG)_CROSS_CONFIG_OPTIONS) \
         $($(PKG)_ENABLE_64_CONFIGURE_OPTIONS) \
         $($(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS) \
@@ -134,6 +142,11 @@
 
     if [ "x$(MXE_SYSTEM)" == "xmingw" ]; then \
       cp '$(1)/.build/src/.libs/octave-gui.exe' '$(3)$(HOST_BINDIR)'; \
+      if [ "x$(ENABLE_BINARY_PACKAGES)" == "xyes" ]; then \
+        mkdir -p '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \
+        $(INSTALL) '$(1)/.build/src/$(MXE_TOOL_PREFIX)mkoctfile' '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \
+        $(INSTALL) '$(1)/.build/src/$(MXE_TOOL_PREFIX)octave-config' '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \
+      fi; \
     fi
 
     if [ "x$(ENABLE_DOCS)" == "xyes" ]; then \