summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
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:42:52 +0000
commitc9fdc1baaba49c63db8d4695f670889fe79b3946 (patch)
tree1f97e0c567becf60e8f0d816d14f5a2824aeb6fb /meta/recipes-support
parent95909bc788bef1baabead94231dffb3b7f59fb00 (diff)
downloadpoky-c9fdc1baaba49c63db8d4695f670889fe79b3946.tar.gz
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. (From OE-Core rev: 4a4af31a03bb9d83ee859f0f39a2bf416cf56915) Signed-off-by: Mike Crowe <mac@mcrowe.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-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 @@
1icu: Ticket #11959: pkgdata dies when compiled with lots'o'flags
2
3See: http://bugs.icu-project.org/trac/ticket/11959
4
5The patch avoids premature failure which results in a segfault.
6
7Upstream-Status: Backport of r38081
8Signed-off-by: Mike Crowe <mac@mcrowe.com>
9
10Index: source/tools/toolutil/flagparser.c
11===================================================================
12--- source/tools/toolutil/flagparser.c (revision 38046)
13+++ source/tools/toolutil/flagparser.c (working copy)
14@@ -96,8 +96,8 @@
15 uprv_free(buffer);
16
17 T_FileStream_close(f);
18-
19- if (U_FAILURE(*status)) {
20+
21+ if (U_FAILURE(*status) && *status != U_BUFFER_OVERFLOW_ERROR) {
22 return -1;
23 }
24
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
16SRC_URI = "${BASE_SRC_URI} \ 16SRC_URI = "${BASE_SRC_URI} \
17 file://icu-pkgdata-large-cmd.patch \ 17 file://icu-pkgdata-large-cmd.patch \
18 file://fix-install-manx.patch \ 18 file://fix-install-manx.patch \
19 file://icu-release-56-1-flagparser-fix.patch \
19 " 20 "
20 21
21SRC_URI_append_class-target = "\ 22SRC_URI_append_class-target = "\
22 file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ 23 file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \
23 " 24 "
24SRC_URI[md5sum] = "e2d523df79d6cb7855c2fbe284f4db29" 25SRC_URI[md5sum] = "c4a2d71ff56aec5ebfab2a3f059be99d"
25SRC_URI[sha256sum] = "e16b22cbefdd354bec114541f7849a12f8fc2015320ca5282ee4fd787571457b" 26SRC_URI[sha256sum] = "3a64e9105c734dcf631c0b3ed60404531bce6c0f5a64bfe1a6402a4cc2314816"
26 27