changeset 5446:cf6495a523c5

Texinfo: drop ncurses dep. Breaks ncurses->gcc->binutils->texinfo->ncurs cycle.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Tue, 28 Jul 2009 15:53:09 +0200
parents 652033f6fece
children 5e39b7894a1f
files GNUmakefile gub/specs/texinfo.py
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/GNUmakefile	Tue Jul 28 15:52:02 2009 +0200
+++ b/GNUmakefile	Tue Jul 28 15:53:09 2009 +0200
@@ -95,7 +95,6 @@
  gawk\
  grep\
  coreutils\
- ncurses\
  texinfo\
  cross/binutils\
  cross/gcc-core\
@@ -108,6 +107,7 @@
  make\
  patch\
  sed\
+ ncurses\
  findutils\
  libtool\
  util-linux\
@@ -184,6 +184,7 @@
 	rsync -az bin/ $(ROOT)/gbin
 	rsync -az gub librestrict nsis patches sourcefiles $(ROOT)
 	$(UNTAR)
+	rm -f fakeroot.save
 	$(FAKEROOT) $(FAKECHROOT) /bin/bash -l -c 'cd /dev && ./MAKEDEV standard'
 #	$(FAKEROOT) $(FAKECHROOT) /bin/bash -l -c '($UNTAR)'
 	mv $(ROOT)/dev/urandom $(ROOT)/dev/urandom-
--- a/gub/specs/texinfo.py	Tue Jul 28 15:52:02 2009 +0200
+++ b/gub/specs/texinfo.py	Tue Jul 28 15:53:09 2009 +0200
@@ -1,9 +1,8 @@
 from gub import tools
 
 class Texinfo__tools (tools.AutoBuild):
-    source = 'ftp://ftp.gnu.org/pub/gnu/texinfo/texinfo-4.11.tar.gz'
+    source = 'ftp://ftp.gnu.org/pub/gnu/texinfo/texinfo-4.13a.tar.gz'
     def patch (self):
-        # for 4.11
-        self.system ('cd %(srcdir)s/build-aux && chmod +x install-sh config.sub config.guess missing')
-    def _get_build_dependencies (self):
-        return ['ncurses']
+        tools.AutoBuild.patch (self)
+        # Drop ncurses dependency
+        self.file_sub ([(' info ',' ')], '%(srcdir)s/Makefile.in')