From 80234031078a47ba0c7481c1a695ca1b9669460a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krystian=20Bac=C5=82awski?= <krystian.baclawski@gmail.com>
Date: Sat, 22 Aug 2015 15:11:17 +0200
Subject: [PATCH] Replace unknown texinfo with one that we know to work.

---
 build-ppc.py | 14 ++++++++++----
 common.py    |  6 +++++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/build-ppc.py b/build-ppc.py
index ca116d0..40b6351 100755
--- a/build-ppc.py
+++ b/build-ppc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python -B
+#!/usr/bin/python -B
 
 # Build cross toolchain for AmigaOS 4.x / PowerPC target.
 
@@ -13,6 +13,7 @@ URLS = \
   ['ftp://ftp.gnu.org/gnu/gmp/gmp-5.1.3.tar.bz2',
    'ftp://ftp.gnu.org/gnu/mpc/mpc-1.0.3.tar.gz',
    'ftp://ftp.gnu.org/gnu/mpfr/mpfr-3.1.3.tar.bz2',
+   'ftp://ftp.gnu.org/gnu/texinfo/texinfo-4.12.tar.gz',
    'http://isl.gforge.inria.fr/isl-0.12.2.tar.bz2',
    'http://www.bastoul.net/cloog/pages/download/cloog-0.18.4.tar.gz',
    'http://soulsphere.org/projects/lhasa/lhasa-0.3.0.tar.gz',
@@ -22,9 +23,7 @@ URLS = \
    ('svn://svn.code.sf.net/p/adtools/code/trunk/gcc', 'gcc-4.2.4'),
    ('svn://svn.code.sf.net/p/adtools/code/branches/binutils/2.23.2',
     'binutils-2.23.2'),
-   ('svn://svn.code.sf.net/p/adtools/code/branches/gcc/4.9.x', 'gcc-4.9.1'),
-   ('http://github.com/adtools/sfdc/archive/master.zip', 'sfdc-master.zip'),
-   ('http://clib2.cvs.sourceforge.net/viewvc/clib2/?view=tar', 'clib2.tar.gz')]
+   ('svn://svn.code.sf.net/p/adtools/code/branches/gcc/4.9.x', 'gcc-4.9.1')]
 
 
 from common import * # NOQA
@@ -95,6 +94,12 @@ def doit():
   build('{lha}')
   install('{lha}')
 
+  source('{texinfo}')
+  configure('{texinfo}',
+            '--prefix={host}')
+  build('{texinfo}')
+  install('{texinfo}')
+
   source('{gmp}')
   configure('{gmp}',
             '--disable-shared',
@@ -215,6 +220,7 @@ if __name__ == "__main__":
          mpc='mpc-1.0.3',
          isl='isl-0.12.2',
          cloog='cloog-0.18.4',
+         texinfo='texinfo-4.12',
          binutils='binutils-{binutils_ver}',
          gcc='gcc-{gcc_ver}',
          patches=path.join('{top}', 'patches'),
diff --git a/common.py b/common.py
index 236d2b4..36457f1 100644
--- a/common.py
+++ b/common.py
@@ -16,7 +16,11 @@ import zipfile
 
 
 VARS = {}
-setvar = VARS.update
+
+
+def setvar(**kwargs):
+  for key, item in kwargs.items():
+    VARS[key] = item.format(**VARS)
 
 
 def fill_in(value):