From 02d6c7f71983740d68be4ccdc0c12007d0097588 Mon Sep 17 00:00:00 2001 From: Tristan Van Berkom Date: Fri, 16 Oct 2015 13:28:33 +0900 Subject: Removing ICU from webtools stratum, using icu-common instead Also including icu-common in web-system-x86_64-generic Change-Id: I1ae85bdcaab70fbaa7ccdd6ad22cbd4cd6f30fa4 --- strata/webtools.morph | 6 +----- strata/webtools/icu.morph | 8 -------- systems/web-system-x86_64-generic.morph | 2 ++ 3 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 strata/webtools/icu.morph diff --git a/strata/webtools.morph b/strata/webtools.morph index 5010a4c1..495a4f3c 100644 --- a/strata/webtools.morph +++ b/strata/webtools.morph @@ -2,14 +2,10 @@ name: webtools kind: stratum description: web things build-depends: +- morph: strata/icu-common.morph - morph: strata/tools.morph - morph: strata/pcre-utils.morph chunks: -- name: icu - morph: strata/webtools/icu.morph - repo: upstream:icu - ref: ba023548a3bff7277cbea4acade3042ce9d8949e - unpetrify-ref: baserock/morph - name: libgit2 repo: upstream:libgit2 ref: 4b0a36e881506a02b43a4ae3c19c93c919b36eeb diff --git a/strata/webtools/icu.morph b/strata/webtools/icu.morph deleted file mode 100644 index 37dec07e..00000000 --- a/strata/webtools/icu.morph +++ /dev/null @@ -1,8 +0,0 @@ -name: icu -kind: chunk -configure-commands: -- cd source; ./runConfigureICU Linux --prefix=/usr -build-commands: -- cd source; unset TARGET ; make -install-commands: -- cd source; unset TARGET ; make DESTDIR="$DESTDIR" install diff --git a/systems/web-system-x86_64-generic.morph b/systems/web-system-x86_64-generic.morph index 2ddc3fdb..090abcbe 100644 --- a/systems/web-system-x86_64-generic.morph +++ b/systems/web-system-x86_64-generic.morph @@ -33,6 +33,8 @@ strata: morph: strata/python2-core.morph - name: nodejs morph: strata/nodejs.morph +- name: icu-common + morph: strata/icu-common.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files -- cgit v1.2.1