From d44fcb3a8327223247261342902bfd0898eb9c6c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 3 Jun 2016 12:14:55 +0300 Subject: icu: update to 57.1 Point to the actual license file in the recipe. Drop icu-release-56-1-flagparser-fix.patch, merged upstream. (From OE-Core rev: 91d230dfbfd8acaea16978ee75c7a75549ffde86) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../icu/icu/icu-release-56-1-flagparser-fix.patch | 24 ------------------ meta/recipes-support/icu/icu_56.1.bb | 29 ---------------------- meta/recipes-support/icu/icu_57.1.bb | 28 +++++++++++++++++++++ 3 files changed, 28 insertions(+), 53 deletions(-) delete mode 100644 meta/recipes-support/icu/icu/icu-release-56-1-flagparser-fix.patch delete mode 100644 meta/recipes-support/icu/icu_56.1.bb create mode 100644 meta/recipes-support/icu/icu_57.1.bb (limited to 'meta/recipes-support') 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 - -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_56.1.bb deleted file mode 100644 index db0de106bc..0000000000 --- a/meta/recipes-support/icu/icu_56.1.bb +++ /dev/null @@ -1,29 +0,0 @@ -require icu.inc - -LIC_FILES_CHKSUM = "file://../license.html;md5=64eff4aadff4d104d6d437c4fde0e6d7" - -def icu_download_version(d): - pvsplit = d.getVar('PV', True).split('.') - return pvsplit[0] + "_" + pvsplit[1] - -ICU_PV = "${@icu_download_version(d)}" - -# http://errors.yoctoproject.org/Errors/Details/20486/ -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" - -BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-${ICU_PV}-src.tgz" -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" - -UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)/" -UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/" diff --git a/meta/recipes-support/icu/icu_57.1.bb b/meta/recipes-support/icu/icu_57.1.bb new file mode 100644 index 0000000000..90c2b82752 --- /dev/null +++ b/meta/recipes-support/icu/icu_57.1.bb @@ -0,0 +1,28 @@ +require icu.inc + +LIC_FILES_CHKSUM = "file://../LICENSE;md5=787d3b37867445c1cdd6f6167bd0e347" + +def icu_download_version(d): + pvsplit = d.getVar('PV', True).split('.') + return pvsplit[0] + "_" + pvsplit[1] + +ICU_PV = "${@icu_download_version(d)}" + +# http://errors.yoctoproject.org/Errors/Details/20486/ +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" + +BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-${ICU_PV}-src.tgz" +SRC_URI = "${BASE_SRC_URI} \ + file://icu-pkgdata-large-cmd.patch \ + file://fix-install-manx.patch \ + " + +SRC_URI_append_class-target = "\ + file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ + " +SRC_URI[md5sum] = "976734806026a4ef8bdd17937c8898b9" +SRC_URI[sha256sum] = "ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581" + +UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)/" +UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/" -- cgit 1.2.3-korg