diff options
| -rw-r--r-- | meta/recipes-support/icu/icu.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-support/icu/icu_66.1.bb | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/meta/recipes-support/icu/icu.inc b/meta/recipes-support/icu/icu.inc index 6d9728903d..670cbedbcb 100644 --- a/meta/recipes-support/icu/icu.inc +++ b/meta/recipes-support/icu/icu.inc @@ -59,7 +59,9 @@ do_install_append_class-target() { # Use icupkg to re-generate it. if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then rm -f ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat - icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat + if [ -f ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ]; then + icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat + fi fi # Remove build host references... diff --git a/meta/recipes-support/icu/icu_66.1.bb b/meta/recipes-support/icu/icu_66.1.bb index a8096c1840..08254648e4 100644 --- a/meta/recipes-support/icu/icu_66.1.bb +++ b/meta/recipes-support/icu/icu_66.1.bb @@ -40,11 +40,15 @@ UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases" EXTRA_OECONF_append_libc-musl = " ac_cv_func_strtod_l=no" +PACKAGECONFIG ?= "" +PACKAGECONFIG[make-icudata] = ",,," + do_make_icudata_class-target () { cd ${S} rm -rf data cp -a ${WORKDIR}/data . patch -p1 < ${WORKDIR}/0001-Fix-big-endian-build.patch + ${@bb.utils.contains('PACKAGECONFIG', 'make-icudata', '', 'exit 0', d)} AR='${BUILD_AR}' \ CC='${BUILD_CC}' \ CPP='${BUILD_CPP}' \ @@ -56,7 +60,7 @@ do_make_icudata_class-target () { LDFLAGS='${BUILD_LDFLAGS}' \ ICU_DATA_FILTER_FILE=${WORKDIR}/filter.json \ ./runConfigureICU Linux --with-data-packaging=archive - oe_runmake ${PARALLEL_MAKE} + oe_runmake install -Dm644 ${S}/data/out/icudt${ICU_MAJOR_VER}l.dat ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat } |