diff --git a/WORKSPACE b/WORKSPACE index b5b90f39b..220361e64 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -4,15 +4,13 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "icu", - strip_prefix = "icu-release-64-2", - sha256 = "dfc62618aa4bd3ca14a3df548cd65fe393155edd213e49c39f3a30ccd618fc27", + strip_prefix = "icu-release-77-1", + integrity = "sha256-5CS6UoLZWtOLUmOaCPuCFk8LDL1/F7U64WvxT4VBhV8=", urls = [ - "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", + "https://storage.googleapis.com/mirror.tensorflow.org/github.com/unicode-org/icu/archive/release-77-1.zip", + "https://github.com/unicode-org/icu/archive/release-77-1.zip", ], build_file = "//third_party/icu:BUILD.bzl", - patches = ["//third_party/icu:udata.patch"], - patch_args = ["-p1"], ) http_archive( diff --git a/third_party/icu/udata.patch b/third_party/icu/udata.patch deleted file mode 100644 index eac684427..000000000 --- a/third_party/icu/udata.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/icu4c/source/common/udata.cpp b/icu4c/source/common/udata.cpp -index efcd2a2f97..80f275c415 100644 ---- a/icu4c/source/common/udata.cpp -+++ b/icu4c/source/common/udata.cpp -@@ -18,11 +18,10 @@ - - #include "unicode/utypes.h" /* U_PLATFORM etc. */ - --#ifdef __GNUC__ --/* if gcc --#define ATTRIBUTE_WEAK __attribute__ ((weak)) --might have to #include some other header --*/ -+#if defined(__GNUC__) || defined(__SUNPRO_CC) -+# define ATTRIBUTE_WEAK __attribute__ ((weak)) -+#else -+# define ATTRIBUTE_WEAK - #endif - - #include "unicode/putil.h" -@@ -649,10 +648,11 @@ extern "C" const DataHeader U_DATA_API U_ICUDATA_ENTRY_POINT; - * partial-data-library access functions where each returns a pointer - * to its data package, if it is linked in. - */ --/* --extern const void *uprv_getICUData_collation(void) ATTRIBUTE_WEAK; --extern const void *uprv_getICUData_conversion(void) ATTRIBUTE_WEAK; --*/ -+ -+U_CDECL_BEGIN -+const void *uprv_getICUData_other(void) ATTRIBUTE_WEAK; -+U_CDECL_END -+ - - /*----------------------------------------------------------------------* - * * -@@ -709,11 +709,11 @@ openCommonData(const char *path, /* Path from OpenChoice? */ - /* - if (uprv_getICUData_collation) { - setCommonICUDataPointer(uprv_getICUData_collation(), FALSE, pErrorCode); -+ }*/ -+ if (uprv_getICUData_other) { -+ setCommonICUDataPointer(uprv_getICUData_other(), FALSE, pErrorCode); - } -- if (uprv_getICUData_conversion) { -- setCommonICUDataPointer(uprv_getICUData_conversion(), FALSE, pErrorCode); -- } -- */ -+ - #if U_PLATFORM_HAS_WINUWP_API == 0 // Windows UWP Platform does not support dll icu data at this time - setCommonICUDataPointer(&U_ICUDATA_ENTRY_POINT, FALSE, pErrorCode); - { -diff --git a/icu4c/source/common/unicode/uconfig.h b/icu4c/source/common/unicode/uconfig.h -index e61eb5795c..95c43f2334 100644 ---- a/icu4c/source/common/unicode/uconfig.h -+++ b/icu4c/source/common/unicode/uconfig.h -@@ -55,6 +55,11 @@ - #include "uconfig_local.h" - #endif - -+// Tensorflow is statically linked on all platforms. -+#ifndef U_STATIC_IMPLEMENTATION -+#define U_STATIC_IMPLEMENTATION -+#endif -+ - /** - * \def U_DEBUG - * Determines whether to include debugging code.