summaryrefslogtreecommitdiff
path: root/strata
diff options
context:
space:
mode:
Diffstat (limited to 'strata')
-rw-r--r--strata/qt4-tools.morph7
-rw-r--r--strata/qt4-tools/icu.morph8
2 files changed, 1 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