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/core.morph                 | 11 +++++++++--
 strata/core/flex.morph            |  2 ++
 strata/core/nano.morph            |  4 ++++
 strata/core/readline.morph        |  6 ++++++
 strata/foundation/linux-pam.morph |  2 ++
 strata/tools/distcc.morph         |  6 +++++-
 strata/tools/vala-bootstrap.morph |  2 ++
 7 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 strata/core/nano.morph
 create mode 100644 strata/core/readline.morph

diff --git a/strata/core.morph b/strata/core.morph
index 5b84f011..0184de51 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -82,7 +82,9 @@ chunks:
   repo: upstream:flex
   ref: de10f98e8a2dc2a021796811490d0f30c3cd90bf
   unpetrify-ref: baserock/build-essential
-  build-depends: []
+  build-depends:
+  - automake
+  - gettext-tarball
 - name: openssl-new
   morph: strata/core/openssl-new.morph
   repo: upstream:openssl-new
@@ -97,10 +99,12 @@ chunks:
   unpetrify-ref: baserock/morph
   build-depends: []
 - name: readline
+  morph: strata/core/readline.morph
   repo: upstream:readline
   ref: 518937ab89be812ccd45e9b8c1ce4ad721d35ef6
   unpetrify-ref: baserock/genivi/baseline
-  build-depends: []
+  build-depends:
+  - automake
 - name: cpython
   morph: strata/core/cpython.morph
   repo: upstream:cpython
@@ -251,11 +255,14 @@ chunks:
   - libtool-tarball
   - pkg-config
 - name: nano
+  morph: strata/core/nano.morph
   repo: upstream:nano-tarball
   ref: 8b74abeb02c01ddc768c465a826360cf33cec063
   unpetrify-ref: baserock/morph
   build-depends:
   - ncurses
+  - automake
+  - gettext-tarball
 - name: bc
   repo: upstream:bc-tarball
   ref: 0956d119432ff6a2e85bae1fa336df799cad70b0
diff --git a/strata/core/flex.morph b/strata/core/flex.morph
index 7ca8f538..615bf79e 100644
--- a/strata/core/flex.morph
+++ b/strata/core/flex.morph
@@ -1,5 +1,7 @@
 name: flex
 kind: chunk
+pre-configure-commands:
+- autoreconf -ivf
 configure-commands:
 - ./configure --prefix="$PREFIX"
 build-commands:
diff --git a/strata/core/nano.morph b/strata/core/nano.morph
new file mode 100644
index 00000000..6a55dc2d
--- /dev/null
+++ b/strata/core/nano.morph
@@ -0,0 +1,4 @@
+name: nano
+kind: chunk
+pre-configure-commands:
+- autoreconf -ivf
diff --git a/strata/core/readline.morph b/strata/core/readline.morph
new file mode 100644
index 00000000..511e124c
--- /dev/null
+++ b/strata/core/readline.morph
@@ -0,0 +1,6 @@
+name: readline
+kind: chunk
+build-system: autotools
+pre-configure-commands:
+- cp /usr/share/automake*/config.guess support
+- cp /usr/share/automake*/config.sub support
diff --git a/strata/foundation/linux-pam.morph b/strata/foundation/linux-pam.morph
index 27d0a8a3..0dfbe759 100644
--- a/strata/foundation/linux-pam.morph
+++ b/strata/foundation/linux-pam.morph
@@ -1,6 +1,8 @@
 name: linux-pam
 kind: chunk
 build-system: autotools
+pre-configure-commands:
+- autoreconf -ivf
 post-install-commands:
 # sudo command is expecting this file.
 - |
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