summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/icu
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/icu')
-rw-r--r--meta/recipes-support/icu/icu.inc16
1 files changed, 9 insertions, 7 deletions
diff --git a/meta/recipes-support/icu/icu.inc b/meta/recipes-support/icu/icu.inc
index f7257d13e8..1329635817 100644
--- a/meta/recipes-support/icu/icu.inc
+++ b/meta/recipes-support/icu/icu.inc
@@ -7,7 +7,7 @@ DEPENDS = "icu-native"
7DEPENDS_class-native = "" 7DEPENDS_class-native = ""
8 8
9S = "${WORKDIR}/icu/source" 9S = "${WORKDIR}/icu/source"
10STAGING_ICU_SOURCE_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/icu" 10STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}"
11 11
12PARALLEL_MAKE = "" 12PARALLEL_MAKE = ""
13FULL_OPTIMIZATION_arm = "-Os" 13FULL_OPTIMIZATION_arm = "-Os"
@@ -17,7 +17,7 @@ inherit autotools pkgconfig binconfig
17# ICU needs the native build directory as an argument to its --with-cross-build option when 17# ICU needs the native build directory as an argument to its --with-cross-build option when
18# cross-compiling. Taken the situation that different builds may share a common sstate-cache 18# cross-compiling. Taken the situation that different builds may share a common sstate-cache
19# into consideration, the native build directory needs to be staged. 19# into consideration, the native build directory needs to be staged.
20EXTRA_OECONF = "--with-cross-build=${STAGING_DATADIR_NATIVE}/icu/source" 20EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}"
21EXTRA_OECONF_class-native = "" 21EXTRA_OECONF_class-native = ""
22 22
23# ICU puts custom m4 autoconf functions in aclocal.m4. 23# ICU puts custom m4 autoconf functions in aclocal.m4.
@@ -29,11 +29,13 @@ do_configure_prepend() {
29 [ -f acinclude.m4 ] || cp aclocal.m4 acinclude.m4 29 [ -f acinclude.m4 ] || cp aclocal.m4 acinclude.m4
30} 30}
31 31
32do_install_append() { 32do_install_append_class-native() {
33 if [ ${PN} == 'icu-native' ]; then 33 mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config
34 mkdir -p ${D}/${STAGING_ICU_SOURCE_DIR_NATIVE} 34 cp -r ${S}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config
35 cp -r ${S} ${D}/${STAGING_ICU_SOURCE_DIR_NATIVE} 35 cp -r ${S}/lib ${D}/${STAGING_ICU_DIR_NATIVE}
36 fi 36 cp -r ${S}/bin ${D}/${STAGING_ICU_DIR_NATIVE}
37 cp -r ${S}/tools ${D}/${STAGING_ICU_DIR_NATIVE}
38
37} 39}
38 40
39PACKAGES =+ "libicudata libicuuc libicui18n libicule libiculx libicutu libicuio" 41PACKAGES =+ "libicudata libicuuc libicui18n libicule libiculx libicutu libicuio"