Mercurial > mxe-octave
changeset 5315:2f280e830838
* src/stable-octave.mk: Bump stable-octave version number to 6.0.1. Update
used version of sundials ida.
* src/stable-octave-1-gnulib.patch: Remove gnulib lseek.c patch.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Mon, 17 Feb 2020 21:48:36 +0100 |
| parents | 7f618ab721ef |
| children | 583e31f07446 |
| files | src/stable-octave-1-gnulib.patch src/stable-octave.mk |
| diffstat | 2 files changed, 2 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/src/stable-octave-1-gnulib.patch Fri Feb 14 13:29:41 2020 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -diff -uNr a/libgnu/unistd.in.h b/libgnu/unistd.in.h ---- a/libgnu/unistd.in.h 2016-06-18 18:47:32.000000000 -0400 -+++ b/libgnu/unistd.in.h 2016-06-23 18:45:42.410781867 -0400 -@@ -734,7 +734,7 @@ - Null terminate it if the name is shorter than LEN. - If the host name is longer than LEN, set errno = EINVAL and return -1. - Return 0 if successful, otherwise set errno and return -1. */ --# if @UNISTD_H_HAVE_WINSOCK2_H@ -+# if !@HAVE_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # undef gethostname - # define gethostname rpl_gethostname - -diff -u a/libgnu/lseek.c b/libgnu/lseek.c ---- a/libgnu/lseek.c 2020-01-25 23:41:47.321133728 -0500 -+++ b/libgnu/lseek.c 2020-01-25 23:43:05.587623161 -0500 -@@ -63,7 +63,7 @@ - return -1; - } - #endif --#if _GL_WINDOWS_64_BIT_OFF_T -+#if _GL_WINDOWS_64_BIT_OFF_T || (defined __MINGW32__ && defined _FILE_OFFSET_BITS && (_FILE_OFFSET_BITS == 64)) - return _lseeki64 (fd, offset, whence); - #else - return lseek (fd, offset, whence)
--- a/src/stable-octave.mk Fri Feb 14 13:29:41 2020 -0500 +++ b/src/stable-octave.mk Mon Feb 17 21:48:36 2020 +0100 @@ -13,7 +13,7 @@ PKG := stable-octave $(PKG)_IGNORE := -$(PKG)_VERSION := 5.2.1 +$(PKG)_VERSION := 6.0.1 $(PKG)_CHECKSUM := ## No checksum $(PKG)_SUBDIR := octave-$($(PKG)_VERSION) $(PKG)_FILE := octave-$($(PKG)_VERSION).tar.lz @@ -21,7 +21,7 @@ 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 libsndfile pcre portaudio pstoedit qhull qrupdate qscintilla readline sundials-27-ida suitesparse texinfo zlib +$(PKG)_DEPS := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack libsndfile pcre portaudio pstoedit qhull qrupdate qscintilla readline sundials-ida suitesparse texinfo zlib ifeq ($(ENABLE_QT5),yes) $(PKG)_DEPS += qt5