summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/icu
diff options
context:
space:
mode:
authorMike Crowe <mac@mcrowe.com>2015-11-27 14:50:27 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-12 23:31:40 +0000
commit4a4af31a03bb9d83ee859f0f39a2bf416cf56915 (patch)
tree34af83a4fa5b63fa8e47db1e0f9bec956c7cbf7b /meta/recipes-support/icu
parentf8a35d8e312df908c73724465035921856d30781 (diff)
downloadopenembedded-core-4a4af31a03bb9d83ee859f0f39a2bf416cf56915.tar.gz
openembedded-core-4a4af31a03bb9d83ee859f0f39a2bf416cf56915.tar.bz2
openembedded-core-4a4af31a03bb9d83ee859f0f39a2bf416cf56915.zip
icu: Upgrade 55.1 -> 56.1
Upgrade ICU from v55.1 to v56.1 and backport a later patch that is necessary to avoid errors during the build. Signed-off-by: Mike Crowe <mac@mcrowe.com>
Diffstat (limited to 'meta/recipes-support/icu')
-rw-r--r--meta/recipes-support/icu/icu/icu-release-56-1-flagparser-fix.patch24
-rw-r--r--meta/recipes-support/icu/icu_56.1.bb (renamed from meta/recipes-support/icu/icu_55.1.bb)5
2 files changed, 27 insertions, 2 deletions
diff --git a/meta/recipes-support/icu/icu/icu-release-56-1-flagparser-fix.patch b/meta/recipes-support/icu/icu/icu-release-56-1-flagparser-fix.patch
new file mode 100644
index 0000000000..1519d84696
--- /dev/null
+++ b/meta/recipes-support/icu/icu/icu-release-56-1-flagparser-fix.patch
@@ -0,0 +1,24 @@
+icu: Ticket #11959: pkgdata dies when compiled with lots'o'flags
+
+See: http://bugs.icu-project.org/trac/ticket/11959
+
+The patch avoids premature failure which results in a segfault.
+
+Upstream-Status: Backport of r38081
+Signed-off-by: Mike Crowe <mac@mcrowe.com>
+
+Index: source/tools/toolutil/flagparser.c
+===================================================================
+--- source/tools/toolutil/flagparser.c (revision 38046)
++++ source/tools/toolutil/flagparser.c (working copy)
+@@ -96,8 +96,8 @@
+ uprv_free(buffer);
+
+ T_FileStream_close(f);
+-
+- if (U_FAILURE(*status)) {
++
++ if (U_FAILURE(*status) && *status != U_BUFFER_OVERFLOW_ERROR) {
+ return -1;
+ }
+
diff --git a/meta/recipes-support/icu/icu_55.1.bb b/meta/recipes-support/icu/icu_56.1.bb
index e91b6f3abe..90c93e840c 100644
--- a/meta/recipes-support/icu/icu_55.1.bb
+++ b/meta/recipes-support/icu/icu_56.1.bb
@@ -16,11 +16,12 @@ BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-${ICU_PV
SRC_URI = "${BASE_SRC_URI} \
file://icu-pkgdata-large-cmd.patch \
file://fix-install-manx.patch \
+ file://icu-release-56-1-flagparser-fix.patch \
"
SRC_URI_append_class-target = "\
file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \
"
-SRC_URI[md5sum] = "e2d523df79d6cb7855c2fbe284f4db29"
-SRC_URI[sha256sum] = "e16b22cbefdd354bec114541f7849a12f8fc2015320ca5282ee4fd787571457b"
+SRC_URI[md5sum] = "c4a2d71ff56aec5ebfab2a3f059be99d"
+SRC_URI[sha256sum] = "3a64e9105c734dcf631c0b3ed60404531bce6c0f5a64bfe1a6402a4cc2314816"