diff options
author | Mike Crowe <mac@mcrowe.com> | 2015-11-27 14:50:27 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-12 23:42:52 +0000 |
commit | c9fdc1baaba49c63db8d4695f670889fe79b3946 (patch) | |
tree | 1f97e0c567becf60e8f0d816d14f5a2824aeb6fb /meta/recipes-support/icu/icu | |
parent | 95909bc788bef1baabead94231dffb3b7f59fb00 (diff) | |
download | poky-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/icu/icu')
-rw-r--r-- | meta/recipes-support/icu/icu/icu-release-56-1-flagparser-fix.patch | 24 |
1 files changed, 24 insertions, 0 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 @@ | |||
1 | icu: Ticket #11959: pkgdata dies when compiled with lots'o'flags | ||
2 | |||
3 | See: http://bugs.icu-project.org/trac/ticket/11959 | ||
4 | |||
5 | The patch avoids premature failure which results in a segfault. | ||
6 | |||
7 | Upstream-Status: Backport of r38081 | ||
8 | Signed-off-by: Mike Crowe <mac@mcrowe.com> | ||
9 | |||
10 | Index: 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 | |||