summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--RepositoryModule_host.mk1
-rw-r--r--external/Module_external.mk1
-rw-r--r--external/icu/ExternalPackage_icu.mk (renamed from icu/ExternalPackage_icu.mk)0
-rw-r--r--external/icu/ExternalProject_icu.mk (renamed from icu/ExternalProject_icu.mk)0
-rw-r--r--external/icu/Makefile (renamed from icu/Makefile)0
-rw-r--r--external/icu/Module_icu.mk (renamed from icu/Module_icu.mk)2
-rw-r--r--external/icu/README (renamed from icu/README)0
-rw-r--r--external/icu/UnpackedTarball_icu.mk (renamed from icu/UnpackedTarball_icu.mk)22
-rw-r--r--external/icu/icu4c-aix.patch (renamed from icu/icu4c-aix.patch)0
-rw-r--r--external/icu/icu4c-android.patch (renamed from icu/icu4c-android.patch)0
-rw-r--r--external/icu/icu4c-buffer-overflow.patch (renamed from icu/icu4c-buffer-overflow.patch)0
-rw-r--r--external/icu/icu4c-build.patch (renamed from icu/icu4c-build.patch)0
-rw-r--r--external/icu/icu4c-macosx.patch (renamed from icu/icu4c-macosx.patch)0
-rw-r--r--external/icu/icu4c-mkdir.patch (renamed from icu/icu4c-mkdir.patch)0
-rw-r--r--external/icu/icu4c-rpath.patch (renamed from icu/icu4c-rpath.patch)0
-rw-r--r--external/icu/icu4c-solarisgcc.patch (renamed from icu/icu4c-solarisgcc.patch)0
-rw-r--r--external/icu/icu4c-warnings.patch (renamed from icu/icu4c-warnings.patch)0
-rw-r--r--external/icu/icu4c-wchar_t.patch (renamed from icu/icu4c-wchar_t.patch)0
-rw-r--r--external/icu/icu4c.10129.wintz.patch (renamed from icu/icu4c.10129.wintz.patch)0
-rw-r--r--external/icu/icu4c.10318.CVE-2013-2924_changeset_34076.patch (renamed from icu/icu4c.10318.CVE-2013-2924_changeset_34076.patch)0
20 files changed, 12 insertions, 14 deletions
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
index 4af02f5a96fe..4af02f5a96fe 100644
--- a/icu/ExternalPackage_icu.mk
+++ b/external/icu/ExternalPackage_icu.mk
diff --git a/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk
index 52cac492f7db..52cac492f7db 100644
--- a/icu/ExternalProject_icu.mk
+++ b/external/icu/ExternalProject_icu.mk
diff --git a/icu/Makefile b/external/icu/Makefile
index ccb1c85a04da..ccb1c85a04da 100644
--- a/icu/Makefile
+++ b/external/icu/Makefile
diff --git a/icu/Module_icu.mk b/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
index 484de1f41536..484de1f41536 100644
--- a/icu/README
+++ b/external/icu/README
diff --git a/icu/UnpackedTarball_icu.mk b/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
index 48659ca0406a..48659ca0406a 100644
--- a/icu/icu4c-aix.patch
+++ b/external/icu/icu4c-aix.patch
diff --git a/icu/icu4c-android.patch b/external/icu/icu4c-android.patch
index 55764a12bbf3..55764a12bbf3 100644
--- a/icu/icu4c-android.patch
+++ b/external/icu/icu4c-android.patch
diff --git a/icu/icu4c-buffer-overflow.patch b/external/icu/icu4c-buffer-overflow.patch
index 7385d3b470d9..7385d3b470d9 100644
--- a/icu/icu4c-buffer-overflow.patch
+++ b/external/icu/icu4c-buffer-overflow.patch
diff --git a/icu/icu4c-build.patch b/external/icu/icu4c-build.patch
index ba47658b3f7f..ba47658b3f7f 100644
--- a/icu/icu4c-build.patch
+++ b/external/icu/icu4c-build.patch
diff --git a/icu/icu4c-macosx.patch b/external/icu/icu4c-macosx.patch
index 0de6ac30381a..0de6ac30381a 100644
--- a/icu/icu4c-macosx.patch
+++ b/external/icu/icu4c-macosx.patch
diff --git a/icu/icu4c-mkdir.patch b/external/icu/icu4c-mkdir.patch
index 859220c37207..859220c37207 100644
--- a/icu/icu4c-mkdir.patch
+++ b/external/icu/icu4c-mkdir.patch
diff --git a/icu/icu4c-rpath.patch b/external/icu/icu4c-rpath.patch
index 44ab8a652923..44ab8a652923 100644
--- a/icu/icu4c-rpath.patch
+++ b/external/icu/icu4c-rpath.patch
diff --git a/icu/icu4c-solarisgcc.patch b/external/icu/icu4c-solarisgcc.patch
index cb668d8b49b1..cb668d8b49b1 100644
--- a/icu/icu4c-solarisgcc.patch
+++ b/external/icu/icu4c-solarisgcc.patch
diff --git a/icu/icu4c-warnings.patch b/external/icu/icu4c-warnings.patch
index 1407f3b5a702..1407f3b5a702 100644
--- a/icu/icu4c-warnings.patch
+++ b/external/icu/icu4c-warnings.patch
diff --git a/icu/icu4c-wchar_t.patch b/external/icu/icu4c-wchar_t.patch
index 2360a08f03a6..2360a08f03a6 100644
--- a/icu/icu4c-wchar_t.patch
+++ b/external/icu/icu4c-wchar_t.patch
diff --git a/icu/icu4c.10129.wintz.patch b/external/icu/icu4c.10129.wintz.patch
index 1c6ace908425..1c6ace908425 100644
--- a/icu/icu4c.10129.wintz.patch
+++ b/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
index 90f50ab0318f..90f50ab0318f 100644
--- a/icu/icu4c.10318.CVE-2013-2924_changeset_34076.patch
+++ b/external/icu/icu4c.10318.CVE-2013-2924_changeset_34076.patch
generated by cgit (git 2.34.1) at 2025-02-10 10:37:34 +0000