From 13818a69d77a5806e2bafa92283a56a9f7ac690d Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Thu, 17 Oct 2013 20:02:31 +0200 Subject: [PATCH] fdo#70393: move icu to a subdir of external Change-Id: I9d8191848b093240f79207446afb13ca6fd708e4 Reviewed-on: https://gerrit.libreoffice.org/6309 Tested-by: LibreOffice gerrit bot Reviewed-by: David Tardon Tested-by: David Tardon --- RepositoryModule_host.mk | 1 - external/Module_external.mk | 1 + {icu => external/icu}/ExternalPackage_icu.mk | 0 {icu => external/icu}/ExternalProject_icu.mk | 0 {icu => external/icu}/Makefile | 0 {icu => external/icu}/Module_icu.mk | 2 -- {icu => external/icu}/README | 0 {icu => external/icu}/UnpackedTarball_icu.mk | 22 +++++++++---------- {icu => external/icu}/icu4c-aix.patch | 0 {icu => external/icu}/icu4c-android.patch | 0 .../icu}/icu4c-buffer-overflow.patch | 0 {icu => external/icu}/icu4c-build.patch | 0 {icu => external/icu}/icu4c-macosx.patch | 0 {icu => external/icu}/icu4c-mkdir.patch | 0 {icu => external/icu}/icu4c-rpath.patch | 0 {icu => external/icu}/icu4c-solarisgcc.patch | 0 {icu => external/icu}/icu4c-warnings.patch | 0 {icu => external/icu}/icu4c-wchar_t.patch | 0 {icu => external/icu}/icu4c.10129.wintz.patch | 0 ....10318.CVE-2013-2924_changeset_34076.patch | 0 20 files changed, 12 insertions(+), 14 deletions(-) rename {icu => external/icu}/ExternalPackage_icu.mk (100%) rename {icu => external/icu}/ExternalProject_icu.mk (100%) rename {icu => external/icu}/Makefile (100%) rename {icu => external/icu}/Module_icu.mk (94%) rename {icu => external/icu}/README (100%) rename {icu => external/icu}/UnpackedTarball_icu.mk (61%) rename {icu => external/icu}/icu4c-aix.patch (100%) rename {icu => external/icu}/icu4c-android.patch (100%) rename {icu => external/icu}/icu4c-buffer-overflow.patch (100%) rename {icu => external/icu}/icu4c-build.patch (100%) rename {icu => external/icu}/icu4c-macosx.patch (100%) rename {icu => external/icu}/icu4c-mkdir.patch (100%) rename {icu => external/icu}/icu4c-rpath.patch (100%) rename {icu => external/icu}/icu4c-solarisgcc.patch (100%) rename {icu => external/icu}/icu4c-warnings.patch (100%) rename {icu => external/icu}/icu4c-wchar_t.patch (100%) rename {icu => external/icu}/icu4c.10129.wintz.patch (100%) rename {icu => external/icu}/icu4c.10318.CVE-2013-2924_changeset_34076.patch (100%) diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 2c21a6c9b600..314dbeb0cbb7 100644 --- a/RepositoryModule_host.mk +++ b/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 \ diff --git a/external/Module_external.mk b/external/Module_external.mk index dac8d0af3150..26b93ad61d38 100644 --- a/external/Module_external.mk +++ b/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) \ )) diff --git a/icu/ExternalPackage_icu.mk b/external/icu/ExternalPackage_icu.mk similarity index 100% rename from icu/ExternalPackage_icu.mk rename to external/icu/ExternalPackage_icu.mk diff --git a/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk similarity index 100% rename from icu/ExternalProject_icu.mk rename to external/icu/ExternalProject_icu.mk diff --git a/icu/Makefile b/external/icu/Makefile similarity index 100% rename from icu/Makefile rename to external/icu/Makefile diff --git a/icu/Module_icu.mk b/external/icu/Module_icu.mk similarity index 94% rename from icu/Module_icu.mk rename to external/icu/Module_icu.mk index 46e02d3de9d5..258c26ea4e61 100644 --- a/icu/Module_icu.mk +++ b/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: diff --git a/icu/README b/external/icu/README similarity index 100% rename from icu/README rename to external/icu/README diff --git a/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk similarity index 61% rename from icu/UnpackedTarball_icu.mk rename to external/icu/UnpackedTarball_icu.mk index dac90d579e0e..2fdc9eefa8c0 100644 --- a/icu/UnpackedTarball_icu.mk +++ b/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: diff --git a/icu/icu4c-aix.patch b/external/icu/icu4c-aix.patch similarity index 100% rename from icu/icu4c-aix.patch rename to external/icu/icu4c-aix.patch diff --git a/icu/icu4c-android.patch b/external/icu/icu4c-android.patch similarity index 100% rename from icu/icu4c-android.patch rename to external/icu/icu4c-android.patch diff --git a/icu/icu4c-buffer-overflow.patch b/external/icu/icu4c-buffer-overflow.patch similarity index 100% rename from icu/icu4c-buffer-overflow.patch rename to external/icu/icu4c-buffer-overflow.patch diff --git a/icu/icu4c-build.patch b/external/icu/icu4c-build.patch similarity index 100% rename from icu/icu4c-build.patch rename to external/icu/icu4c-build.patch diff --git a/icu/icu4c-macosx.patch b/external/icu/icu4c-macosx.patch similarity index 100% rename from icu/icu4c-macosx.patch rename to external/icu/icu4c-macosx.patch diff --git a/icu/icu4c-mkdir.patch b/external/icu/icu4c-mkdir.patch similarity index 100% rename from icu/icu4c-mkdir.patch rename to external/icu/icu4c-mkdir.patch diff --git a/icu/icu4c-rpath.patch b/external/icu/icu4c-rpath.patch similarity index 100% rename from icu/icu4c-rpath.patch rename to external/icu/icu4c-rpath.patch diff --git a/icu/icu4c-solarisgcc.patch b/external/icu/icu4c-solarisgcc.patch similarity index 100% rename from icu/icu4c-solarisgcc.patch rename to external/icu/icu4c-solarisgcc.patch diff --git a/icu/icu4c-warnings.patch b/external/icu/icu4c-warnings.patch similarity index 100% rename from icu/icu4c-warnings.patch rename to external/icu/icu4c-warnings.patch diff --git a/icu/icu4c-wchar_t.patch b/external/icu/icu4c-wchar_t.patch similarity index 100% rename from icu/icu4c-wchar_t.patch rename to external/icu/icu4c-wchar_t.patch diff --git a/icu/icu4c.10129.wintz.patch b/external/icu/icu4c.10129.wintz.patch similarity index 100% rename from icu/icu4c.10129.wintz.patch rename to external/icu/icu4c.10129.wintz.patch diff --git a/icu/icu4c.10318.CVE-2013-2924_changeset_34076.patch b/external/icu/icu4c.10318.CVE-2013-2924_changeset_34076.patch similarity index 100% rename from icu/icu4c.10318.CVE-2013-2924_changeset_34076.patch rename to external/icu/icu4c.10318.CVE-2013-2924_changeset_34076.patch