diff options
-rw-r--r-- | strata/icu.morph | 12 | ||||
-rw-r--r-- | strata/icu/icu.morph (renamed from strata/qt5-tools/icu.morph) | 0 | ||||
-rw-r--r-- | strata/qt4-tools.morph | 7 | ||||
-rw-r--r-- | strata/qt4-tools/icu.morph | 8 | ||||
-rw-r--r-- | strata/qt5-tools.morph | 8 | ||||
-rw-r--r-- | strata/webtools.morph | 5 | ||||
-rw-r--r-- | strata/webtools/icu.morph | 8 | ||||
-rw-r--r-- | systems/qt4-devel-system-x86_64-generic.morph | 2 | ||||
-rw-r--r-- | systems/qt5-devel-system-x86_64-generic.morph | 2 | ||||
-rw-r--r-- | systems/web-system-x86_64-generic.morph | 2 |
10 files changed, 20 insertions, 34 deletions
diff --git a/strata/icu.morph b/strata/icu.morph new file mode 100644 index 00000000..b725f3c1 --- /dev/null +++ b/strata/icu.morph @@ -0,0 +1,12 @@ +name: icu +kind: stratum +description: | + This stratum contains icu +build-depends: +- morph: strata/core.morph +chunks: +- name: icu + morph: strata/icu/icu.morph + repo: upstream:icu + ref: ba023548a3bff7277cbea4acade3042ce9d8949e + unpetrify-ref: baserock/morph diff --git a/strata/qt5-tools/icu.morph b/strata/icu/icu.morph index f9532f04..f9532f04 100644 --- a/strata/qt5-tools/icu.morph +++ b/strata/icu/icu.morph diff --git a/strata/qt4-tools.morph b/strata/qt4-tools.morph index 698dc5ce..63426cc6 100644 --- a/strata/qt4-tools.morph +++ b/strata/qt4-tools.morph @@ -5,12 +5,8 @@ build-depends: - morph: strata/tools.morph - morph: strata/x-generic.morph - morph: strata/multimedia-gstreamer-0.10.morph +- morph: strata/icu.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/strata/qt5-tools.morph b/strata/qt5-tools.morph index 7fb8403e..8d0dfca0 100644 --- a/strata/qt5-tools.morph +++ b/strata/qt5-tools.morph @@ -4,19 +4,13 @@ description: Qt5 Development Libraries and Tools build-depends: - morph: strata/tools.morph - morph: strata/x-generic.morph +- morph: strata/icu.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/webtools.morph b/strata/webtools.morph index 17a1abda..6eb722a2 100644 --- a/strata/webtools.morph +++ b/strata/webtools.morph @@ -5,11 +5,6 @@ build-depends: - 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/qt4-devel-system-x86_64-generic.morph b/systems/qt4-devel-system-x86_64-generic.morph index 15b85f70..c47ce982 100644 --- a/systems/qt4-devel-system-x86_64-generic.morph +++ b/systems/qt4-devel-system-x86_64-generic.morph @@ -24,6 +24,8 @@ strata: morph: strata/x-common.morph - name: x-generic morph: strata/x-generic.morph +- name: icu + morph: strata/icu.morph - name: qt4-tools morph: strata/qt4-tools.morph - name: qt4-sdk diff --git a/systems/qt5-devel-system-x86_64-generic.morph b/systems/qt5-devel-system-x86_64-generic.morph index 3cdce60c..8dc5b6e8 100644 --- a/systems/qt5-devel-system-x86_64-generic.morph +++ b/systems/qt5-devel-system-x86_64-generic.morph @@ -24,6 +24,8 @@ strata: morph: strata/x-common.morph - name: x-generic morph: strata/x-generic.morph +- name: icu + morph: strata/icu.morph - name: qt5-tools morph: strata/qt5-tools.morph - name: qt5-tools-qtwebkit diff --git a/systems/web-system-x86_64-generic.morph b/systems/web-system-x86_64-generic.morph index 0b6e84b1..b0ab909b 100644 --- a/systems/web-system-x86_64-generic.morph +++ b/systems/web-system-x86_64-generic.morph @@ -21,6 +21,8 @@ strata: morph: strata/pcre-utils.morph - name: lighttpd-server morph: strata/lighttpd-server.morph +- name: icu + morph: strata/icu.morph - name: webtools morph: strata/webtools.morph - name: erlang |