summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/icu/icu.inc12
-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}"
26EXTRA_OECONF_class-native = "" 26EXTRA_OECONF_class-native = ""
27EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" 27EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}"
28 28
29
30# strtod_l() is not supported by musl; also xlocale.h is missing
31# It is not possible to disable its use via configure switches or env vars
32# so monkey patching is needed.
33do_configure_prepend_libc-musl () {
34 sed -i -e 's,DU_HAVE_STRTOD_L=1,DU_HAVE_STRTOD_L=0,' ${S}/configure.ac
35}
36
29PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" 37PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}"
30do_install_append_class-native() { 38do_install_append_class-native() {
31 mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config 39 mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config
@@ -36,15 +44,13 @@ do_install_append_class-native() {
36 cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} 44 cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE}
37} 45}
38 46
39PACKAGES =+ "libicudata libicuuc libicui18n libicule libiculx libicutu libicuio" 47PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio"
40 48
41FILES_${PN}-dev += "${libdir}/${BPN}/" 49FILES_${PN}-dev += "${libdir}/${BPN}/"
42 50
43FILES_libicudata = "${libdir}/libicudata.so.*" 51FILES_libicudata = "${libdir}/libicudata.so.*"
44FILES_libicuuc = "${libdir}/libicuuc.so.*" 52FILES_libicuuc = "${libdir}/libicuuc.so.*"
45FILES_libicui18n = "${libdir}/libicui18n.so.*" 53FILES_libicui18n = "${libdir}/libicui18n.so.*"
46FILES_libicule = "${libdir}/libicule.so.*"
47FILES_libiculx = "${libdir}/libiculx.so.*"
48FILES_libicutu = "${libdir}/libicutu.so.*" 54FILES_libicutu = "${libdir}/libicutu.so.*"
49FILES_libicuio = "${libdir}/libicuio.so.*" 55FILES_libicuio = "${libdir}/libicuio.so.*"
50 56
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 @@
1require icu.inc 1require icu.inc
2 2
3LIC_FILES_CHKSUM = "file://../LICENSE;md5=787d3b37867445c1cdd6f6167bd0e347" 3LIC_FILES_CHKSUM = "file://../LICENSE;md5=1b3b75c1777cd49ad5c6a24cd338cfc9"
4 4
5def icu_download_version(d): 5def icu_download_version(d):
6 pvsplit = d.getVar('PV', True).split('.') 6 pvsplit = d.getVar('PV', True).split('.')
@@ -21,8 +21,8 @@ SRC_URI = "${BASE_SRC_URI} \
21SRC_URI_append_class-target = "\ 21SRC_URI_append_class-target = "\
22 file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ 22 file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \
23 " 23 "
24SRC_URI[md5sum] = "976734806026a4ef8bdd17937c8898b9" 24SRC_URI[md5sum] = "1901302aaff1c1633ef81862663d2917"
25SRC_URI[sha256sum] = "ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581" 25SRC_URI[sha256sum] = "0eb46ba3746a9c2092c8ad347a29b1a1b4941144772d13a88667a7b11ea30309"
26 26
27UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/" 27UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/"
28UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/" 28UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/"