diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-06-03 12:14:55 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-03 16:53:35 +0100 |
| commit | 91d230dfbfd8acaea16978ee75c7a75549ffde86 (patch) | |
| tree | 2207a189f121c036719ee42e3047faec1d97e4e9 /meta/recipes-support | |
| parent | 9689cd9a006e0ac3528be3718d0a1bb0950ad5e4 (diff) | |
| download | openembedded-core-91d230dfbfd8acaea16978ee75c7a75549ffde86.tar.gz openembedded-core-91d230dfbfd8acaea16978ee75c7a75549ffde86.tar.bz2 openembedded-core-91d230dfbfd8acaea16978ee75c7a75549ffde86.zip | |
icu: update to 57.1
Point to the actual license file in the recipe.
Drop icu-release-56-1-flagparser-fix.patch, merged upstream.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.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.patch | 24 | ||||
| -rw-r--r-- | meta/recipes-support/icu/icu_57.1.bb (renamed from meta/recipes-support/icu/icu_56.1.bb) | 7 |
2 files changed, 3 insertions, 28 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 deleted file mode 100644 index 1519d84696..0000000000 --- a/meta/recipes-support/icu/icu/icu-release-56-1-flagparser-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -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_56.1.bb b/meta/recipes-support/icu/icu_57.1.bb index db0de106bc..90c2b82752 100644 --- a/meta/recipes-support/icu/icu_56.1.bb +++ b/meta/recipes-support/icu/icu_57.1.bb @@ -1,6 +1,6 @@ require icu.inc -LIC_FILES_CHKSUM = "file://../license.html;md5=64eff4aadff4d104d6d437c4fde0e6d7" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=787d3b37867445c1cdd6f6167bd0e347" def icu_download_version(d): pvsplit = d.getVar('PV', True).split('.') @@ -16,14 +16,13 @@ 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] = "c4a2d71ff56aec5ebfab2a3f059be99d" -SRC_URI[sha256sum] = "3a64e9105c734dcf631c0b3ed60404531bce6c0f5a64bfe1a6402a4cc2314816" +SRC_URI[md5sum] = "976734806026a4ef8bdd17937c8898b9" +SRC_URI[sha256sum] = "ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/" UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/" |