fdo#70393: move icu to a subdir of external

Change-Id: I9d8191848b093240f79207446afb13ca6fd708e4
Reviewed-on: https://gerrit.libreoffice.org/6309
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

RepositoryModule_host.mk

@@ -61,7 +61,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	i18nlangtag \
 	i18npool \
 	i18nutil \
-	$(call gb_Helper_optional,ICU,icu) \
 	idl \
 	$(call gb_Helper_optional,DESKTOP,idlc) \
 	instsetoo_native \

external/Module_external.mk

@@ -37,6 +37,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,HSQLDB,hsqldb) \
 	$(call gb_Helper_optional,HUNSPELL,hunspell) \
 	$(call gb_Helper_optional,HYPHEN,hyphen) \
+	$(call gb_Helper_optional,ICU,icu) \
 	$(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \
 	$(call gb_Helper_optional,LIBPNG,libpng) \
 ))

external/icu/Module_icu.mk

@@ -9,12 +9,10 @@
 
 $(eval $(call gb_Module_Module,icu))
 
-ifeq ($(SYSTEM_ICU),NO)
 $(eval $(call gb_Module_add_targets,icu,\
 	UnpackedTarball_icu \
 	ExternalPackage_icu \
 	ExternalProject_icu \
 ))
-endif
 
 # vim: set noet sw=4 ts=4:

external/icu/UnpackedTarball_icu.mk

@@ -18,17 +18,17 @@ $(eval $(call gb_UnpackedTarball_set_pre_action,icu,\
 ))
 
 $(eval $(call gb_UnpackedTarball_add_patches,icu,\
-	icu/icu4c.10318.CVE-2013-2924_changeset_34076.patch \
-	icu/icu4c.10129.wintz.patch \
-	icu/icu4c-build.patch \
-	icu/icu4c-aix.patch \
-	icu/icu4c-wchar_t.patch \
-	icu/icu4c-warnings.patch \
-	icu/icu4c-macosx.patch \
-	icu/icu4c-solarisgcc.patch \
-	icu/icu4c-mkdir.patch \
-	icu/icu4c-buffer-overflow.patch \
-	icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch \
+	external/icu/icu4c.10318.CVE-2013-2924_changeset_34076.patch \
+	external/icu/icu4c.10129.wintz.patch \
+	external/icu/icu4c-build.patch \
+	external/icu/icu4c-aix.patch \
+	external/icu/icu4c-wchar_t.patch \
+	external/icu/icu4c-warnings.patch \
+	external/icu/icu4c-macosx.patch \
+	external/icu/icu4c-solarisgcc.patch \
+	external/icu/icu4c-mkdir.patch \
+	external/icu/icu4c-buffer-overflow.patch \
+	external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch \
 ))
 
 # vim: set noet sw=4 ts=4: