Mercurial > mxe-octave

changeset 3579:63798d0032c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
texinfo: revert back to 4.13a * src/texinfo-1-fixes.patch: old patch * src/texinfo.mk: change version to 4.13a.
author John Donoghue
date Wed, 23 Apr 2014 14:32:50 -0400
parents 583d3bf548e6
children 51563235a7c6
files src/texinfo-1-fixes.patch src/texinfo.mk
diffstat 2 files changed, 23 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/src/texinfo-1-fixes.patch	Tue Apr 15 21:32:17 2014 -0400
+++ b/src/texinfo-1-fixes.patch	Wed Apr 23 14:32:50 2014 -0400
@@ -1,17 +1,12 @@
-diff -ur texinfo-5.2.orig/info/pcterm.c texinfo-5.2/info/pcterm.c
---- texinfo-5.2.orig/info/pcterm.c	2014-04-15 18:58:25.000000000 -0400
-+++ texinfo-5.2/info/pcterm.c	2014-04-15 19:00:25.000000000 -0400
-@@ -1299,7 +1299,7 @@
- }
- 
- /* These should never be called, but they make the linker happy.  */
--
-+#if 0
- int       tputs (const char *a, int b, int (*c)(int))
- {
-   perror ("tputs"); return 0; /* here and below, added dummy retvals */
-@@ -1339,3 +1339,4 @@
- {
-   perror ("tcsetattr"); return 0;
- }
-+#endif
+diff -ru a/util/texi2dvi b/util/texi2dvi
+--- a/util/texi2dvi	2008-09-18 14:46:01.000000000 -0400
++++ b/util/texi2dvi	2014-02-14 13:21:50.038015947 -0500
+@@ -1683,7 +1683,7 @@
+ 
+   # If the COMMAND_LINE_FILENAME is not absolute (e.g., --debug.tex),
+   # prepend `./' in order to avoid that the tools take it as an option.
+-  echo "$command_line_filename" | $EGREP '^(/|[A-z]:/)' >&6 \
++  echo "$command_line_filename" | $EGREP '^(/|[A-Za-z]:/)' >&6 \
+   || command_line_filename="./$command_line_filename"
+ 
+   # See if the file exists.  If it doesn't we're in trouble since, even
--- a/src/texinfo.mk	Tue Apr 15 21:32:17 2014 -0400
+++ b/src/texinfo.mk	Wed Apr 23 14:32:50 2014 -0400
@@ -3,10 +3,10 @@
 
 PKG             := texinfo
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.2
-$(PKG)_CHECKSUM := dc54edfbb623d46fb400576b3da181f987e63516
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
+$(PKG)_VERSION  := 4.13a
+$(PKG)_CHECKSUM := a1533cf8e03ea4fa6c443b73f4c85e4da04dead0
+$(PKG)_SUBDIR   := $(PKG)-4.13
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := ftp://ftp.gnu.org/gnu/texinfo/$($(PKG)_FILE)
 $(PKG)_DEPS     := # libgnurx
 
@@ -20,9 +20,12 @@
     cd '$(1).build' && '$(1)/configure' \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
-        --prefix='$(HOST_PREFIX)' LIBS='-lpthread -lws2_32'
+        --prefix='$(HOST_PREFIX)'
 
-    $(MAKE) -C '$(1).build' -j '$(JOBS)'
-
-    $(MAKE) -C '$(1).build' -j '1' install DESTDIR='$(3)'
+    ## All we need for Octave is makeinfo.
+    $(MAKE) -C '$(1).build/lib' -j '$(JOBS)'
+    $(MAKE) -C '$(1).build/gnulib/lib' -j '$(JOBS)'
+    $(MAKE) -C '$(1).build/makeinfo' -j '$(JOBS)'
+ 
+    $(MAKE) -C '$(1).build/makeinfo' -j 1 install DESTDIR='$(3)'
 endef