From 8f8df38eb9857710afd0b550cb863532b37a1593 Mon Sep 17 00:00:00 2001
From: Tiago Gomes <tiago.gomes@codethink.co.uk>
Date: Wed, 11 Feb 2015 11:13:55 +0000
Subject: Regenerate config.{guess,sub} scripts

Some packages have old config.guess and config.sub scripts which don't
recognize the aarch64-linux-gnu GNU triplet.  For some cases, it is
enough to do a `autoreconfig -if` to update those scripts.  However,
this approach cannot be used because when the configure scripts are not
compatible with the current automake, autoheader, aclocal and friends;
or when the project doesn't use automake at all (it has Makefile.in
files, but not Makefile.am files).  For those cases, we copy the system
config.guess and config.sub scripts installed by automake.
---
 strata/tools/distcc.morph         | 6 +++++-
 strata/tools/vala-bootstrap.morph | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'strata/tools')

diff --git a/strata/tools/distcc.morph b/strata/tools/distcc.morph
index 9f42b50e..82adbe50 100644
--- a/strata/tools/distcc.morph
+++ b/strata/tools/distcc.morph
@@ -1,6 +1,10 @@
 name: distcc
 kind: chunk
 build-system: autotools
-configure-commands:
+pre-configure-commands:
 - NOCONFIGURE=1 ./autogen.sh
+# distcc doesn't use automake, so we cannot autoreconf it
+- cp /usr/share/automake*/config.guess .
+- cp /usr/share/automake*/config.sub .
+configure-commands:
 - ./configure --prefix="$PREFIX" --disable-Werror
diff --git a/strata/tools/vala-bootstrap.morph b/strata/tools/vala-bootstrap.morph
index c09299f6..e55b1887 100644
--- a/strata/tools/vala-bootstrap.morph
+++ b/strata/tools/vala-bootstrap.morph
@@ -1,5 +1,7 @@
 name: vala-bootstrap
 kind: chunk
 build-system: autotools
+pre-configure-commands:
+- autoreconf -ivf
 configure-commands:
 - ./configure --prefix="$PREFIX"
-- 
cgit v1.2.1