diff options
| author | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2015-10-16 13:27:04 +0900 |
|---|---|---|
| committer | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2015-10-19 09:42:35 +0000 |
| commit | afb0ec8684db239a7278a18844dab509891f39c8 (patch) | |
| tree | 2942577a39bb4be7c737202f667b7847f8ffa22c | |
| parent | 9359f7487a1883a29d08e036af91a57103ac7b8b (diff) | |
| download | definitions-afb0ec8684db239a7278a18844dab509891f39c8.tar.gz | |
Removing ICU from qt4-tools stratum, using icu-common instead
Also including icu-common in qt4-devel-system-x86_64-generic
Change-Id: I8e152dfa476341e1d37b978f0e4980d49747a544
| -rw-r--r-- | strata/qt4-tools.morph | 7 | ||||
| -rw-r--r-- | strata/qt4-tools/icu.morph | 8 | ||||
| -rw-r--r-- | systems/qt4-devel-system-x86_64-generic.morph | 2 |
3 files changed, 3 insertions, 14 deletions
diff --git a/strata/qt4-tools.morph b/strata/qt4-tools.morph index 698dc5ce..577c467d 100644 --- a/strata/qt4-tools.morph +++ b/strata/qt4-tools.morph @@ -2,15 +2,11 @@ name: qt4-tools kind: stratum description: Qt4 Development Libraries and Tools build-depends: +- morph: strata/icu-common.morph - morph: strata/tools.morph - morph: strata/x-generic.morph - morph: strata/multimedia-gstreamer-0.10.morph chunks: -- name: icu - morph: strata/qt4-tools/icu.morph - repo: upstream:icu - ref: ba023548a3bff7277cbea4acade3042ce9d8949e - unpetrify-ref: baserock/morph - name: ruby-1.8 morph: strata/qt4-tools/ruby-1.8.morph repo: upstream:ruby @@ -29,5 +25,4 @@ chunks: ref: a182f020bc1703c20d86ba18f2f6b4ea8889de84 unpetrify-ref: baserock/morph build-depends: - - icu - ruby-1.9 diff --git a/strata/qt4-tools/icu.morph b/strata/qt4-tools/icu.morph deleted file mode 100644 index 37dec07e..00000000 --- a/strata/qt4-tools/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/qt4-devel-system-x86_64-generic.morph b/systems/qt4-devel-system-x86_64-generic.morph index 0285fa70..e8230c88 100644 --- a/systems/qt4-devel-system-x86_64-generic.morph +++ b/systems/qt4-devel-system-x86_64-generic.morph @@ -38,6 +38,8 @@ strata: morph: strata/connman-common.morph - name: enlightenment morph: strata/enlightenment.morph +- name: icu-common + morph: strata/icu-common.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files |