summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2015-02-12 13:05:14 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-15 21:58:27 +0000
commitdc9c8bcda8f6a72d1d46b86be5df32410008e19d (patch)
treeac056d019e09af6d6c1e6e1576731692ee34c833
parentabb6cdef942fd151e33a14eceebc9958995b570f (diff)
downloadpoky-dc9c8bcda8f6a72d1d46b86be5df32410008e19d.tar.gz
icu: remove obsolete aclocal.m4 workaround (fixed upstream since v52.1)
Patch also includes some minor formatting cleanup of icu.inc. (From OE-Core rev: 0d5103997afef773376df01260f0d52555e2a9cd) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/icu/icu.inc18
1 files changed, 5 insertions, 13 deletions
diff --git a/meta/recipes-support/icu/icu.inc b/meta/recipes-support/icu/icu.inc
index f192b95582..f4254b5f5c 100644
--- a/meta/recipes-support/icu/icu.inc
+++ b/meta/recipes-support/icu/icu.inc
@@ -1,5 +1,8 @@
1SUMMARY = "International Component for Unicode libraries" 1SUMMARY = "International Component for Unicode libraries"
2DESCRIPTION = "The International Component for Unicode (ICU) is a mature, portable set of C/C++ and Java libraries for Unicode support, software internationalization (I18N) and globalization (G11N), giving applications the same results on all platforms." 2DESCRIPTION = "The International Component for Unicode (ICU) is a mature, \
3portable set of C/C++ and Java libraries for Unicode support, software \
4internationalization (I18N) and globalization (G11N), giving applications the \
5same results on all platforms."
3HOMEPAGE = "http://site.icu-project.org/" 6HOMEPAGE = "http://site.icu-project.org/"
4 7
5LICENSE = "ICU" 8LICENSE = "ICU"
@@ -23,23 +26,13 @@ EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}"
23EXTRA_OECONF_class-native = "" 26EXTRA_OECONF_class-native = ""
24EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" 27EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}"
25 28
26# ICU puts custom m4 autoconf functions in aclocal.m4.
27# However, this file is deleted in our build system.
28# To make it work, we copy aclocal.m4 to acinclude.m4.
29# This is a bug of ICU. See bug reference:
30# http://bugs.icu-project.org/trac/ticket/9790
31do_configure_prepend() {
32 [ -f ${S}/acinclude.m4 ] || cp ${S}/aclocal.m4 ${S}/acinclude.m4
33}
34
35do_install_append_class-native() { 29do_install_append_class-native() {
36 mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config 30 mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config
37 cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config 31 cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config
38 cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config 32 cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config
39 cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} 33 cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE}
40 cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} 34 cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE}
41 cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} 35 cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE}
42
43} 36}
44 37
45PACKAGES =+ "libicudata libicuuc libicui18n libicule libiculx libicutu libicuio" 38PACKAGES =+ "libicudata libicuuc libicui18n libicule libiculx libicutu libicuio"
@@ -55,4 +48,3 @@ FILES_libicutu = "${libdir}/libicutu.so.*"
55FILES_libicuio = "${libdir}/libicuio.so.*" 48FILES_libicuio = "${libdir}/libicuio.so.*"
56 49
57BBCLASSEXTEND = "native nativesdk" 50BBCLASSEXTEND = "native nativesdk"
58