summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2015-10-16 13:25:22 +0900
committerTiago Gomes <tiago.gomes@codethink.co.uk>2015-10-19 09:38:03 +0000
commit9359f7487a1883a29d08e036af91a57103ac7b8b (patch)
treea5a1d7e6270b3683def8d461d9c8d4b2d5342b48
parent60b575347de21167e0778a63ef75f4bb0a721d68 (diff)
downloaddefinitions-9359f7487a1883a29d08e036af91a57103ac7b8b.tar.gz
Removing ICU from qt5-tools stratum, using icu-common instead
Also including icu-common in qt5-devel-system-x86_64-generic Change-Id: I389c2e7adb49bb2241ca4c62a1a4b8bae8a5cc7e
-rw-r--r--strata/qt5-tools.morph8
-rw-r--r--strata/qt5-tools/icu.morph9
-rw-r--r--systems/qt5-devel-system-x86_64-generic.morph2
3 files changed, 3 insertions, 16 deletions
diff --git a/strata/qt5-tools.morph b/strata/qt5-tools.morph
index 7fb8403e..2a5a61ac 100644
--- a/strata/qt5-tools.morph
+++ b/strata/qt5-tools.morph
@@ -2,21 +2,15 @@ name: qt5-tools
kind: stratum
description: Qt5 Development Libraries and Tools
build-depends:
+- morph: strata/icu-common.morph
- morph: strata/tools.morph
- morph: strata/x-generic.morph
chunks:
-- name: icu
- morph: strata/qt5-tools/icu.morph
- repo: upstream:icu
- ref: ba023548a3bff7277cbea4acade3042ce9d8949e
- unpetrify-ref: baserock/morph
- name: qtbase
morph: strata/qt5-tools/qtbase.morph
repo: upstream:qt5/qtbase
ref: 5367fa356233da4c0f28172a8f817791525f5457
unpetrify-ref: v5.4.0
- build-depends:
- - icu
- name: qtsvg
morph: strata/qt5-tools/qtsvg.morph
repo: upstream:qt5/qtsvg
diff --git a/strata/qt5-tools/icu.morph b/strata/qt5-tools/icu.morph
deleted file mode 100644
index f9532f04..00000000
--- a/strata/qt5-tools/icu.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: icu
-kind: chunk
-configure-commands:
-- sed -e 's/LDFLAGSICUDT/#LDFLAGSICUDT/' -i source/config/mh-linux
-- 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/qt5-devel-system-x86_64-generic.morph b/systems/qt5-devel-system-x86_64-generic.morph
index c342ceb9..b68faf79 100644
--- a/systems/qt5-devel-system-x86_64-generic.morph
+++ b/systems/qt5-devel-system-x86_64-generic.morph
@@ -40,6 +40,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