diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-support/icu/icu.inc | 12 | ||||
| -rw-r--r-- | meta/recipes-support/icu/icu_58.1.bb (renamed from meta/recipes-support/icu/icu_57.1.bb) | 6 |
2 files changed, 12 insertions, 6 deletions
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_58.1.bb index 90c2b82752..cc7c94707b 100644 --- a/meta/recipes-support/icu/icu_57.1.bb +++ b/meta/recipes-support/icu/icu_58.1.bb @@ -1,6 +1,6 @@ require icu.inc -LIC_FILES_CHKSUM = "file://../LICENSE;md5=787d3b37867445c1cdd6f6167bd0e347" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=1b3b75c1777cd49ad5c6a24cd338cfc9" def icu_download_version(d): pvsplit = d.getVar('PV', True).split('.') @@ -21,8 +21,8 @@ SRC_URI = "${BASE_SRC_URI} \ SRC_URI_append_class-target = "\ file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ " -SRC_URI[md5sum] = "976734806026a4ef8bdd17937c8898b9" -SRC_URI[sha256sum] = "ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581" +SRC_URI[md5sum] = "1901302aaff1c1633ef81862663d2917" +SRC_URI[sha256sum] = "0eb46ba3746a9c2092c8ad347a29b1a1b4941144772d13a88667a7b11ea30309" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/" UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/" |