Mercurial > mxe-octave

changeset 4215:136474a59a67

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
octave: remove old patches * src/octave-1-docinstall.patch: removed patch * src/octave-1-fixes.patch: removed patch * dist-files.mk: removed old patch refs, add octave-1-gnulib.patch * src/octave-1-gnulib.patch: add new patch * src/mingw-octave-1-msys-fixes.patch: removed
author John D
date Mon, 12 Sep 2016 07:53:03 -0400
parents c18e196786bb
children 1a94644e3679
files dist-files.mk src/mingw-octave-1-msys-fixes.patch src/octave-1-docinstall.patch src/octave-1-fixes.patch src/octave-1-gnulib.patch
diffstat 5 files changed, 13 insertions(+), 77 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Sat Aug 27 17:48:05 2016 +0900
+++ b/dist-files.mk	Mon Sep 12 07:53:03 2016 -0400
@@ -318,7 +318,6 @@
   mingw-hdf5-1.patch \
   mingw-libgcrypt-1-fixes.patch \
   mingw-libmng-1-noundefines.patch \
-  mingw-octave-1-msys-fixes.patch \
   mingw-openssl-3-libdeps.patch \
   mingw-osmesa-1-fixes.patch \
   mingw-pango-1-fixes.patch \
@@ -439,8 +438,7 @@
   ocaml-flexdll.mk \
   ocaml-native-1-fixes.patch \
   ocaml-native.mk \
-  octave-1-docinstall.patch \
-  octave-1-fixes.patch \
+  octave-1-gnulib.patch \
   octave.mk \
   of-actuarial.mk \
   of-communications-1-fixes.patch \
--- a/src/mingw-octave-1-msys-fixes.patch	Sat Aug 27 17:48:05 2016 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-Changes required for octave to compile under msys2
-
-diff -ur octave-4.0.0.orig/libinterp/corefcn/syscalls.cc octave-4.0.0/libinterp/corefcn/syscalls.cc
---- octave-4.0.0.orig/libinterp/corefcn/syscalls.cc	2015-06-14 08:00:55.195888300 -0400
-+++ octave-4.0.0/libinterp/corefcn/syscalls.cc	2015-06-14 08:50:10.755418300 -0400
-@@ -30,6 +30,7 @@
- #include <config.h>
- #endif
- 
-+#include <ctime>
- #include <cstdio>
- #include <cstring>
- 
-diff -ur octave-4.0.0.orig/liboctave/system/file-stat.cc octave-4.0.0/liboctave/system/file-stat.cc
---- octave-4.0.0.orig/liboctave/system/file-stat.cc	2015-06-14 08:00:26.881838600 -0400
-+++ octave-4.0.0/liboctave/system/file-stat.cc	2015-06-14 08:49:10.992967600 -0400
-@@ -24,6 +24,7 @@
- #include <config.h>
- #endif
- 
-+#include <ctime>
- #include <cerrno>
- #include <cstring>
- 
-diff -ur octave-4.0.0.orig/liboctave/system/oct-syscalls.cc octave-4.0.0/liboctave/system/oct-syscalls.cc
---- octave-4.0.0.orig/liboctave/system/oct-syscalls.cc	2015-06-14 08:00:26.913038700 -0400
-+++ octave-4.0.0/liboctave/system/oct-syscalls.cc	2015-06-14 08:49:37.309661500 -0400
-@@ -24,6 +24,7 @@
- #include <config.h>
- #endif
- 
-+#include <ctime>
- #include <cerrno>
- #include <cstdlib>
- 
-diff -ur octave-4.0.0.orig/libinterp/corefcn/oct-tex-lexer.cc octave-4.0.0/libinterp/corefcn/oct-tex-lexer.cc
---- octave-4.0.0.orig/libinterp/corefcn/oct-tex-lexer.cc	2015-06-14 14:15:46.436310300 -0400
-+++ octave-4.0.0/libinterp/corefcn/oct-tex-lexer.cc	2015-06-14 14:24:23.464145100 -0400
-@@ -3,7 +3,7 @@
- #include <config.h>
- #endif
- 
--
-+#include <ctime>
- 
- 
- #line 10 "corefcn/oct-tex-lexer.cc"
--- a/src/octave-1-docinstall.patch	Sat Aug 27 17:48:05 2016 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-diff -ur a/doc/interpreter/Makefile.in b/doc/interpreter/Makefile.in
---- a/doc/interpreter/Makefile.in	2013-12-27 17:01:52.000000000 -0500
-+++ b/doc/interpreter/Makefile.in	2014-01-21 12:47:59.618865568 -0500
-@@ -2435,8 +2435,10 @@
- 	  if test -d "$$d2"; then \
- 	    echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \
- 	    $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
--	    echo " $(INSTALL_DATA) '$$d2'/* '$(DESTDIR)$(htmldir)/$$f'"; \
--	    $(INSTALL_DATA) "$$d2"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
-+	    for htm in "$$d2"/*; do \
-+	      echo " $(INSTALL_DATA) '$$htm' '$(DESTDIR)$(htmldir)/$$f'"; \
-+	      $(INSTALL_DATA) "$$htm" "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
-+	    done; \
- 	  else \
- 	    list2="$$list2 $$d2"; \
- 	  fi; \
--- a/src/octave-1-fixes.patch	Sat Aug 27 17:48:05 2016 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- a/libgnu/unistd.in.h	2013-11-26 03:43:39.000000000 -0500
-+++ b/libgnu/unistd.in.h	2014-02-16 16:21:36.254338221 -0500
-@@ -714,7 +714,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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/octave-1-gnulib.patch	Mon Sep 12 07:53:03 2016 -0400
@@ -0,0 +1,12 @@
+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