Mercurial > mxe-octave
changeset 3609:360eff7d9c06
texinfo: compile native info when native target.
* src/mingw-texinfo-1-fixes.patch: define sleep in mingw.
* src/texinfo.mk: only build tools libs for cross build ginfo when doing cross build.
author | John Donoghue |
---|---|
date | Mon, 09 Jun 2014 08:11:22 -0400 |
parents | 7bccd055043e |
children | 566fd51378f2 |
files | src/mingw-texinfo-1-fixes.patch src/texinfo.mk |
diffstat | 2 files changed, 26 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/mingw-texinfo-1-fixes.patch Mon Jun 09 08:18:39 2014 -0400 +++ b/src/mingw-texinfo-1-fixes.patch Mon Jun 09 08:11:22 2014 -0400 @@ -951,3 +951,17 @@ reset_info_window_sizes (void) { terminal_goto_xy (0, 0); +diff -ur texinfo-4.13.orig/info/terminal.c texinfo-4.13/info/terminal.c +--- texinfo-4.13.orig/info/terminal.c 2014-06-09 00:27:32 -0400 ++++ texinfo-4.13/info/terminal.c 2014-06-09 00:33:37 -0400 +@@ -47,6 +47,10 @@ + #endif /* not HAVE_TERMCAP_H */ + #endif /* not HAVE_NCURSES_TERMCAP_H */ + ++#if defined(__MSDOS__) || defined(__MINGW32__) ++ unsigned int sleep(unsigned int); ++#endif ++ + /* Function "hooks". If you make one of these point to a function, that + function is called when appropriate instead of its namesake. Your + function is called with exactly the same arguments that were passed
--- a/src/texinfo.mk Mon Jun 09 08:18:39 2014 -0400 +++ b/src/texinfo.mk Mon Jun 09 08:11:22 2014 -0400 @@ -34,11 +34,16 @@ $(MAKE) -C '$(1).build/makeinfo' -j 1 install DESTDIR='$(3)' # octave-cli needs info to display help - # need build native tools in order to build info - $(MAKE) -C '$(1).build/tools/lib' -j $(JOBS) - $(MAKE) -C '$(1).build/tools/gnulib/lib' -j $(JOBS) - $(MAKE) -C '$(1).build/tools/info' -j $(JOBS) makedoc - $(MAKE) -C '$(1).build/info' -j 1 funs.h - $(MAKE) -C '$(1).build/info' -j '$(JOBS)' ginfo.exe - $(INSTALL) '$(1).build/info/ginfo.exe' '$(3)$(HOST_BINDIR)/info.exe' + # for cross build, need build native tools in order to build info + if [ "x$(MXE_NATIVE_BUILD)" = "xyes" ]; then \ + $(MAKE) -C '$(1).build/info' -j '$(JOBS)'; \ + $(MAKE) -C '$(1).build/info' -j 1 install DESTDIR='$(3)'; \ + else \ + $(MAKE) -C '$(1).build/tools/lib' -j $(JOBS); \ + $(MAKE) -C '$(1).build/tools/gnulib/lib' -j $(JOBS); \ + $(MAKE) -C '$(1).build/tools/info' -j $(JOBS) makedoc; \ + $(MAKE) -C '$(1).build/info' -j 1 funs.h; \ + $(MAKE) -C '$(1).build/info' -j '$(JOBS)' ginfo.exe; \ + $(INSTALL) '$(1).build/info/ginfo.exe' '$(3)$(HOST_BINDIR)/info.exe'; \ + fi endef