From 3c01e48bb4ef53a1112993dd9cfe1aa66928c0d1 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 28 Nov 2016 15:34:12 +0200 Subject: icu: update to 58.1 The copyright for the software has been transferred to Unicode Inc from IBM, but the terms are same. libiculx and libicule are no longer produced as they depend on an external package icu-le-hb (previous versions had an option of using an internal implementation which now has been dropped). I have verified that icu dependencies in oe-core and meta-oe still build. (From OE-Core rev: 24c7ed595adf16e90816e2ef7f6417740deb688d) Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-support/icu/icu.inc | 12 +++++++++--- meta/recipes-support/icu/icu_57.1.bb | 28 ---------------------------- meta/recipes-support/icu/icu_58.1.bb | 28 ++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 31 deletions(-) delete mode 100644 meta/recipes-support/icu/icu_57.1.bb create mode 100644 meta/recipes-support/icu/icu_58.1.bb diff --git a/meta/recipes-support/icu/icu.inc b/meta/recipes-support/icu/icu.inc index cc6f222a50..f3dc1e0abf 100644 --- a/meta/recipes-support/icu/icu.inc +++ b/meta/recipes-support/icu/icu.inc @@ -26,6 +26,14 @@ EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" EXTRA_OECONF_class-native = "" EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" + +# strtod_l() is not supported by musl; also xlocale.h is missing +# It is not possible to disable its use via configure switches or env vars +# so monkey patching is needed. +do_configure_prepend_libc-musl () { + sed -i -e 's,DU_HAVE_STRTOD_L=1,DU_HAVE_STRTOD_L=0,' ${S}/configure.ac +} + PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" do_install_append_class-native() { mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config @@ -36,15 +44,13 @@ do_install_append_class-native() { cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} } -PACKAGES =+ "libicudata libicuuc libicui18n libicule libiculx libicutu libicuio" +PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" FILES_${PN}-dev += "${libdir}/${BPN}/" FILES_libicudata = "${libdir}/libicudata.so.*" FILES_libicuuc = "${libdir}/libicuuc.so.*" FILES_libicui18n = "${libdir}/libicui18n.so.*" -FILES_libicule = "${libdir}/libicule.so.*" -FILES_libiculx = "${libdir}/libiculx.so.*" FILES_libicutu = "${libdir}/libicutu.so.*" FILES_libicuio = "${libdir}/libicuio.so.*" diff --git a/meta/recipes-support/icu/icu_57.1.bb b/meta/recipes-support/icu/icu_57.1.bb deleted file mode 100644 index 90c2b82752..0000000000 --- a/meta/recipes-support/icu/icu_57.1.bb +++ /dev/null @@ -1,28 +0,0 @@ -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/" diff --git a/meta/recipes-support/icu/icu_58.1.bb b/meta/recipes-support/icu/icu_58.1.bb new file mode 100644 index 0000000000..cc7c94707b --- /dev/null +++ b/meta/recipes-support/icu/icu_58.1.bb @@ -0,0 +1,28 @@ +require icu.inc + +LIC_FILES_CHKSUM = "file://../LICENSE;md5=1b3b75c1777cd49ad5c6a24cd338cfc9" + +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] = "1901302aaff1c1633ef81862663d2917" +SRC_URI[sha256sum] = "0eb46ba3746a9c2092c8ad347a29b1a1b4941144772d13a88667a7b11ea30309" + +UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)/" +UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/" -- cgit 1.2.3-korg