summaryrefslogtreecommitdiff
path: root/external/icu/UnpackedTarball_icu.mk
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2017-09-13 13:42:29 +0200
committerAron Budea <aron.budea@collabora.com>2018-01-19 13:08:13 +0100
commit81dc13dc71045a7d6c3be2f980928544e6385844 (patch)
tree2eb370fca77eccbf9105ec34fc4b3bbbff4f9dc8 /external/icu/UnpackedTarball_icu.mk
parent0cbb2e661b51353751d3eed82aeea3dbdd44c05e (diff)
icu: do not include non-standardized xlocale.h if U_PLATFORM_IS_LINUX_BASED
... should be more platforms ... but be conservative. U_PLATFORM_IMPLEMENTS_POSIX does not hold what it promises. "The file and this data structure is not standardized. Don't rely on it. It can go away without warning." ... And since glibc 2.26 it's gone. https://ssl.icu-project.org/trac/ticket/13329 Change-Id: I4c1f6130571f5d094cb35ce70e4d333763cee32a (cherry picked from commit 9e399bc613bb4ea1470bd52c64af920d4e9bc39b) Reviewed-on: https://gerrit.libreoffice.org/46584 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit 5bbe46ee00921586b9b72297e7be9048e0e921e9)
Diffstat (limited to 'external/icu/UnpackedTarball_icu.mk')
-rw-r--r--external/icu/UnpackedTarball_icu.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk
index f1658a229586..1254d6fb993c 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/khmerbreakengine.patch \
external/icu/icu4c-changeset-39671.patch.1 \
external/icu/icu4c-changeset-40324.patch.1 \
+ external/icu/icu4c-58-icu13329-xlocale.patch.1 \
))
$(eval $(call gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict))