Mercurial > mxe-octave

changeset 3438:7113585920c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid argument list too long error when installing octave html docs * src/octave-1-docinstall.patch src/stable-octave-1-docinstall.patch: New files. Use a loop instead of a single command with globbing to install html docs. * src/octave.mk, src/stable-octave.mk: Don't run autoreconf.
author John W. Eaton <jwe@octave.org>
date Tue, 21 Jan 2014 13:59:09 -0500
parents 4a9afc3f9600
children c9ade6d47f3a
files src/octave-1-docinstall.patch src/octave.mk src/stable-octave-1-docinstall.patch src/stable-octave.mk
diffstat 4 files changed, 32 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/octave-1-docinstall.patch	Tue Jan 21 13:59:09 2014 -0500
@@ -0,0 +1,16 @@
+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.mk	Tue Jan 21 12:44:40 2014 -0500
+++ b/src/octave.mk	Tue Jan 21 13:59:09 2014 -0500
@@ -93,7 +93,6 @@
     fi
 
     mkdir '$(1)/.build'
-    cd '$(1)' && autoreconf -W none
     cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/stable-octave-1-docinstall.patch	Tue Jan 21 13:59:09 2014 -0500
@@ -0,0 +1,16 @@
+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/stable-octave.mk	Tue Jan 21 12:44:40 2014 -0500
+++ b/src/stable-octave.mk	Tue Jan 21 13:59:09 2014 -0500
@@ -93,7 +93,6 @@
     fi
 
     mkdir '$(1)/.build'
-    cd '$(1)' && autoreconf -W none
     cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \