From 7e49752a2c92a1da2cf3dcc9cd25bb2f07ed69c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <javier.jardon@codethink.co.uk>
Date: Tue, 26 May 2015 15:53:22 +0100
Subject: Make gettext depend in libexpat to add support to translate XML files

Also, use autotools instead the experimental cmake system as It
doesnt seem to generate the correct libexpat.so.x files.

Thanks to Daniel Silverstone for the automake line to add
the missing automake files (like install-sh) as upstream doesnt
have them

Change-Id: Ide6ad8ecb9ed35a42348a882cb9acc3b36fc4e34
---
 strata/core.morph          | 14 +++++++-------
 strata/core/libexpat.morph | 10 ++++------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/strata/core.morph b/strata/core.morph
index 816280af..deb14952 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -19,11 +19,18 @@ chunks:
   repo: upstream:gdbm-tarball
   ref: e5faeaaf75ecfb705a9b643b3e4cb881ebb69f48
   unpetrify-ref: gdbm-1.11
+- name: libexpat
+  morph: strata/core/libexpat.morph
+  repo: upstream:libexpat
+  ref: 7cfc09db3e258129ab05811f2f9e351746ddab9f
+  unpetrify-ref: R_2_1_0
 - name: gettext-tarball
   morph: strata/core/gettext-tarball.morph
   repo: upstream:gettext-tarball
   ref: 482840e61f86ca321838a91e902c41d40c098bbb
   unpetrify-ref: gettext-0.19.4
+  build-depends:
+  - libexpat
 - name: mini-utils
   morph: strata/core/mini-utils.morph
   repo: baserock:baserock/mini-utils
@@ -163,13 +170,6 @@ chunks:
   - libtool-tarball
   - openssl-new
   - ca-certificates
-- name: libexpat
-  morph: strata/core/libexpat.morph
-  repo: upstream:libexpat
-  ref: 7cfc09db3e258129ab05811f2f9e351746ddab9f
-  unpetrify-ref: R_2_1_0
-  build-depends:
-  - cmake
 - name: XML-Parser
   repo: upstream:XML-Parser
   ref: e1a3ec157140a699e3020836475a0df622f70f1b
diff --git a/strata/core/libexpat.morph b/strata/core/libexpat.morph
index b36a67aa..05285c0d 100644
--- a/strata/core/libexpat.morph
+++ b/strata/core/libexpat.morph
@@ -1,8 +1,6 @@
 name: libexpat
 kind: chunk
-configure-commands:
-- mkdir o && cd o && cmake -DCMAKE_INSTALL_PREFIX=/usr ..
-build-commands:
-- cd o && make
-install-commands:
-- cd o && make DESTDIR="$DESTDIR" install
+build-system: autotools
+pre-configure-commands:
+- ./buildconf.sh
+- automake --add-missing --copy || true
-- 
cgit v1.2.1