diff --git a/third_party/icu/data/BUILD.bazel b/third_party/icu/data/BUILD.bazel index 7db21566e4e..6ff47a8d5fc 100644 --- a/third_party/icu/data/BUILD.bazel +++ b/third_party/icu/data/BUILD.bazel @@ -15,16 +15,13 @@ exports_files(["LICENSE"]) # # First, download, build, and install ICU. This installs tools such as makeconv. # Then, run the following from your icu4c/source directory: -# $ cd data/mappings -# $ rm *.cnv # there shouldn't be any .cnv files here to begin with -# $ grep \.ucm ucmcore.mk | \ -# sed 's/\(UCM_SOURCE_CORE=\)\?\([^ ]\+\.ucm\)\\\?/\2/g' | \ -# tr '\n' ' ' | xargs makeconv -# $ ls *.cnv > filelist.lst -# $ pkgdata -m common -p ucmcore filelist.lst -# $ genccode -f custom_conversion_data ucmcore.dat -# This creates custom_conversion_data.c. You will need to change the target -# :conversion_data to depend on your custom source instead of :conversion_data.c +# $ cp [path to filters.json] . +# $ ICU_DATA_FILTER_FILE=filters.json ./runConfigureICU Linux +# $ make clean && make +# $ cd data/out/tmp +# $ genccode icudt64l.dat +# $ echo 'U_CAPI const void * U_EXPORT2 uprv_getICUData_conversion() { return icudt64l_dat.bytes; }' >> icudt64l_dat.c +# This creates icudt64l_dat.c, which you can move, rename, gzip, then split. filegroup( name = "conversion_files", srcs = glob(["icu_conversion_data.c.gz.*"]), diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aa b/third_party/icu/data/icu_conversion_data.c.gz.aa index b68a2c6516f..543b6615708 100644 Binary files a/third_party/icu/data/icu_conversion_data.c.gz.aa and b/third_party/icu/data/icu_conversion_data.c.gz.aa differ diff --git a/third_party/icu/data/icu_conversion_data.c.gz.ab b/third_party/icu/data/icu_conversion_data.c.gz.ab index d60aa92d675..d8cd5108e62 100644 Binary files a/third_party/icu/data/icu_conversion_data.c.gz.ab and b/third_party/icu/data/icu_conversion_data.c.gz.ab differ diff --git a/third_party/icu/data/icu_conversion_data.c.gz.ac b/third_party/icu/data/icu_conversion_data.c.gz.ac index de9b69ff947..bde21d16f57 100644 Binary files a/third_party/icu/data/icu_conversion_data.c.gz.ac and b/third_party/icu/data/icu_conversion_data.c.gz.ac differ diff --git a/third_party/icu/data/icu_conversion_data.c.gz.ad b/third_party/icu/data/icu_conversion_data.c.gz.ad index d5abb06b8ca..f476988a0b2 100644 Binary files a/third_party/icu/data/icu_conversion_data.c.gz.ad and b/third_party/icu/data/icu_conversion_data.c.gz.ad differ diff --git a/third_party/icu/data/icu_conversion_data.c.gz.ae b/third_party/icu/data/icu_conversion_data.c.gz.ae index 0e54fdb9eaf..3388b38c1a2 100644 Binary files a/third_party/icu/data/icu_conversion_data.c.gz.ae and b/third_party/icu/data/icu_conversion_data.c.gz.ae differ diff --git a/third_party/icu/data/icu_conversion_data.c.gz.af b/third_party/icu/data/icu_conversion_data.c.gz.af index cfbeb165ad3..344e3925f39 100644 Binary files a/third_party/icu/data/icu_conversion_data.c.gz.af and b/third_party/icu/data/icu_conversion_data.c.gz.af differ diff --git a/third_party/icu/data/icu_conversion_data.c.gz.ag b/third_party/icu/data/icu_conversion_data.c.gz.ag index bde20b6da62..249ffddde77 100644 Binary files a/third_party/icu/data/icu_conversion_data.c.gz.ag and b/third_party/icu/data/icu_conversion_data.c.gz.ag differ diff --git a/third_party/icu/data/icu_conversion_data.c.gz.ah b/third_party/icu/data/icu_conversion_data.c.gz.ah index ae31dffbe2a..8893be20419 100644 Binary files a/third_party/icu/data/icu_conversion_data.c.gz.ah and b/third_party/icu/data/icu_conversion_data.c.gz.ah differ diff --git a/third_party/icu/data/icu_conversion_data.c.gz.ai b/third_party/icu/data/icu_conversion_data.c.gz.ai index 981b869561a..e6251e3a11c 100644 Binary files a/third_party/icu/data/icu_conversion_data.c.gz.ai and b/third_party/icu/data/icu_conversion_data.c.gz.ai differ diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aj b/third_party/icu/data/icu_conversion_data.c.gz.aj index 1ae6bce382a..3e1dc684c93 100644 Binary files a/third_party/icu/data/icu_conversion_data.c.gz.aj and b/third_party/icu/data/icu_conversion_data.c.gz.aj differ diff --git a/third_party/icu/udata.patch b/third_party/icu/udata.patch index 4c975439e21..db6a06d26ef 100644 --- a/third_party/icu/udata.patch +++ b/third_party/icu/udata.patch @@ -12,10 +12,9 @@ /** * \def U_DEBUG * Determines whether to include debugging code. - --- a/icu4c/source/common/udata.cpp +++ b/icu4c/source/common/udata.cpp -@@ -18,15 +18,15 @@ +@@ -18,11 +18,10 @@ #include "unicode/utypes.h" /* U_PLATFORM etc. */ @@ -31,12 +30,7 @@ #endif #include "unicode/putil.h" - #include "unicode/udata.h" -+#include "unicode/umachine.h" - #include "unicode/uversion.h" - #include "charstr.h" - #include "cmemory.h" -@@ -641,10 +641,11 @@ +@@ -649,10 +648,9 @@ * partial-data-library access functions where each returns a pointer * to its data package, if it is linked in. */ @@ -44,22 +38,19 @@ -extern const void *uprv_getICUData_collation(void) ATTRIBUTE_WEAK; -extern const void *uprv_getICUData_conversion(void) ATTRIBUTE_WEAK; -*/ -+ -+//extern "C" const void *uprv_getICUData_collation(void); +U_CDECL_BEGIN +const void *uprv_getICUData_conversion(void) ATTRIBUTE_WEAK; +U_CDECL_END /*----------------------------------------------------------------------* * * -@@ -702,10 +703,11 @@ +@@ -710,10 +708,11 @@ if (uprv_getICUData_collation) { setCommonICUDataPointer(uprv_getICUData_collation(), FALSE, pErrorCode); } + */ if (uprv_getICUData_conversion) { -- setCommonICUDataPointer(uprv_getICUData_conversion(), FALSE, pErrorCode); -+ setCommonICUDataPointer(uprv_getICUData_conversion(), FALSE, pErrorCode); + setCommonICUDataPointer(uprv_getICUData_conversion(), FALSE, pErrorCode); } - */ + diff --git a/third_party/icu/workspace.bzl b/third_party/icu/workspace.bzl index ddd309a3ee6..a2131a5005e 100644 --- a/third_party/icu/workspace.bzl +++ b/third_party/icu/workspace.bzl @@ -10,11 +10,11 @@ def clean_dep(dep): def repo(): third_party_http_archive( name = "icu", - strip_prefix = "icu-release-62-1", - sha256 = "e15ffd84606323cbad5515bf9ecdf8061cc3bf80fb883b9e6aa162e485aa9761", + strip_prefix = "icu-release-64-2", + sha256 = "dfc62618aa4bd3ca14a3df548cd65fe393155edd213e49c39f3a30ccd618fc27", urls = [ - "https://storage.googleapis.com/mirror.tensorflow.org/github.com/unicode-org/icu/archive/release-62-1.tar.gz", - "https://github.com/unicode-org/icu/archive/release-62-1.tar.gz", + "https://storage.googleapis.com/mirror.tensorflow.org/github.com/unicode-org/icu/archive/release-64-2.zip", + "https://github.com/unicode-org/icu/archive/release-64-2.zip", ], build_file = "//third_party/icu:BUILD.bazel", system_build_file = "//third_party/icu:BUILD.system",