summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <javier.jardon@codethink.co.uk>2015-05-26 15:53:22 +0100
committerBaserock Gerrit <gerrit@baserock.org>2015-05-26 16:43:14 +0000
commit7e49752a2c92a1da2cf3dcc9cd25bb2f07ed69c8 (patch)
tree9b65a03392a36d8fc9f90a84ca888394b0cde7be
parentce2d609fea5b5ed77d244f93c018d29c2f8a19b4 (diff)
downloaddefinitions-7e49752a2c92a1da2cf3dcc9cd25bb2f07ed69c8.tar.gz
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
-rw-r--r--strata/core.morph14
-rw-r--r--strata/core/libexpat.morph10
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