diff options
-rw-r--r-- | strata/qt5-tools.morph | 8 | ||||
-rw-r--r-- | strata/qt5-tools/icu.morph | 9 | ||||
-rw-r--r-- | systems/qt5-devel-system-x86_64-generic.morph | 2 |
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 |