summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-02-02 13:28:12 +0000
committerJavier Jardón <jjardon@gnome.org>2015-02-02 17:34:23 +0000
commit5f0ff4f6a324753af9c5378a5bca66da18ae14c5 (patch)
treed36cbdaa465da4a7431537115a523765bef4fbfe
parentdb0b9615fdead45277aabfc64c9ccbec02179888 (diff)
downloaddefinitions-5f0ff4f6a324753af9c5378a5bca66da18ae14c5.tar.gz
strata/core: Use latest gettext tarball (0.19.4)
-rw-r--r--strata/core.morph20
-rw-r--r--strata/core/gettext-tarball.morph5
-rw-r--r--strata/core/gettext.morph9
3 files changed, 15 insertions, 19 deletions
diff --git a/strata/core.morph b/strata/core.morph
index 8c483de5..797d15aa 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -22,11 +22,11 @@ chunks:
ref: 51871d08a48ff781186f7a7b22ec69a1db38eb4c
unpetrify-ref: baserock/build-essential
build-depends: []
-- name: gettext
- morph: strata/core/gettext.morph
- repo: upstream:gettext
- ref: 3898e324f07c05404b63d71f0e519f352fb1e072
- unpetrify-ref: baserock/build-essential
+- name: gettext-tarball
+ morph: strata/core/gettext-tarball.morph
+ repo: upstream:gettext-tarball
+ ref: 482840e61f86ca321838a91e902c41d40c098bbb
+ unpetrify-ref: gettext-0.19.4
build-depends: []
- name: mini-utils
morph: strata/core/mini-utils.morph
@@ -140,7 +140,7 @@ chunks:
build-depends:
- autoconf-tarball
- automake
- - gettext
+ - gettext-tarball
- libtool
- name: libxml2
repo: upstream:libxml2
@@ -197,7 +197,7 @@ chunks:
- autoconf-tarball
- cpython
- curl
- - gettext
+ - gettext-tarball
- libexpat
- openssl-new
- name: help2man
@@ -218,7 +218,7 @@ chunks:
- automake
- bash
- flex
- - gettext
+ - gettext-tarball
- git
- help2man
- mini-utils
@@ -245,7 +245,7 @@ chunks:
build-depends:
- autoconf-tarball
- automake
- - gettext
+ - gettext-tarball
- git
- libtool
- pkg-config
@@ -284,7 +284,7 @@ chunks:
build-depends:
- autoconf-tarball
- automake
- - gettext
+ - gettext-tarball
- libtool
- bison
- name: patch
diff --git a/strata/core/gettext-tarball.morph b/strata/core/gettext-tarball.morph
new file mode 100644
index 00000000..4983b484
--- /dev/null
+++ b/strata/core/gettext-tarball.morph
@@ -0,0 +1,5 @@
+name: gettext-tarball
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./configure --prefix="$PREFIX"
diff --git a/strata/core/gettext.morph b/strata/core/gettext.morph
deleted file mode 100644
index 3e2c56b5..00000000
--- a/strata/core/gettext.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: gettext
-kind: chunk
-max-jobs: 1
-configure-commands:
-- ./configure --prefix=/usr
-build-commands:
-- make EXAMPLESPOFILES=
-install-commands:
-- make EXAMPLESPOFILES= DESTDIR="$DESTDIR" install