All of lore.kernel.org
 help / color / mirror / Atom feed
From: Denys Dmytriyenko <denis@denix.org>
To: meta-arago@arago-project.org
Subject: [PATCHv2 03/12] icu: overlay the latest version from oe-core/master
Date: Mon, 07 Oct 2013 15:00:18 -0400	[thread overview]
Message-ID: <1381172427-18302-4-git-send-email-denis@denix.org> (raw)
In-Reply-To: <1381172427-18302-1-git-send-email-denis@denix.org>

From: Denys Dmytriyenko <denys@ti.com>

The latest version from oe-core/master is overlayed due to existing fixes and
in order to apply additional fix for LDFLAGSICUDT on ARM. Can be removed once
migrated to Dora code base.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
v2 - provide description with reasons for overlaying

 .../icu/icu-51.2/icu-pkgdata-large-cmd.patch       | 29 ++++++++++++
 meta-arago-distro/recipes-support/icu/icu.inc      | 55 ++++++++++++++++++++++
 meta-arago-distro/recipes-support/icu/icu_51.2.bb  | 13 +++++
 3 files changed, 97 insertions(+)
 create mode 100644 meta-arago-distro/recipes-support/icu/icu-51.2/icu-pkgdata-large-cmd.patch
 create mode 100644 meta-arago-distro/recipes-support/icu/icu.inc
 create mode 100644 meta-arago-distro/recipes-support/icu/icu_51.2.bb

diff --git a/meta-arago-distro/recipes-support/icu/icu-51.2/icu-pkgdata-large-cmd.patch b/meta-arago-distro/recipes-support/icu/icu-51.2/icu-pkgdata-large-cmd.patch
new file mode 100644
index 0000000..6e40659
--- /dev/null
+++ b/meta-arago-distro/recipes-support/icu/icu-51.2/icu-pkgdata-large-cmd.patch
@@ -0,0 +1,29 @@
+pkgdata.cpp: use LARGE_BUFFER_MAX_SIZE for cmd
+
+Use LARGE_BUFFER_MAX_SIZE for cmd rather than SMALL_BUFFER_MAX_SIZE,
+otherwise there was a Segmentation fault error when the command line is
+long, this should be a misplay since other cmd uses
+LARGE_BUFFER_MAX_SIZE.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ tools/pkgdata/pkgdata.cpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/pkgdata/pkgdata.cpp b/tools/pkgdata/pkgdata.cpp
+--- a/tools/pkgdata/pkgdata.cpp
++++ b/tools/pkgdata/pkgdata.cpp
+@@ -1019,7 +1019,7 @@ normal_symlink_mode:
+ 
+ static int32_t pkg_installLibrary(const char *installDir, const char *targetDir, UBool noVersion) {
+     int32_t result = 0;
+-    char cmd[SMALL_BUFFER_MAX_SIZE];
++    char cmd[LARGE_BUFFER_MAX_SIZE];
+ 
+     sprintf(cmd, "cd %s && %s %s %s%s%s",
+             targetDir,
+-- 
+1.7.10.4
+
diff --git a/meta-arago-distro/recipes-support/icu/icu.inc b/meta-arago-distro/recipes-support/icu/icu.inc
new file mode 100644
index 0000000..e3944cd
--- /dev/null
+++ b/meta-arago-distro/recipes-support/icu/icu.inc
@@ -0,0 +1,55 @@
+SUMMARY = "International Component for Unicode libraries"
+DESCRIPTION = "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."
+HOMEPAGE = "http://site.icu-project.org/"
+
+LICENSE = "ICU"
+DEPENDS = "icu-native"
+DEPENDS_class-native = ""
+
+S = "${WORKDIR}/icu/source"
+STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}"
+
+PARALLEL_MAKE = ""
+CPPFLAGS_append_libc-uclibc = " -DU_TIMEZONE=0"
+
+inherit autotools pkgconfig binconfig
+
+# ICU needs the native build directory as an argument to its --with-cross-build option when
+# cross-compiling. Taken the situation that different builds may share a common sstate-cache
+# into consideration, the native build directory needs to be staged.
+EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}"
+EXTRA_OECONF_class-native = ""
+
+# ICU puts custom m4 autoconf functions in aclocal.m4.
+# However, this file is deleted in our build system. 
+# To make it work, we copy aclocal.m4 to acinclude.m4.
+# This is a bug of ICU. See bug reference:
+# http://bugs.icu-project.org/trac/ticket/9790
+do_configure_prepend() {
+    [ -f ${S}/acinclude.m4 ] || cp ${S}/aclocal.m4 ${S}/acinclude.m4
+}
+
+do_install_append_class-native() {
+	mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config
+	cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config
+        cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config
+	cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE}
+	cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE}
+	cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE}
+
+}
+
+PACKAGES =+ "libicudata libicuuc libicui18n libicule libiculx 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.*"
+
+BBCLASSEXTEND = "native"
+
diff --git a/meta-arago-distro/recipes-support/icu/icu_51.2.bb b/meta-arago-distro/recipes-support/icu/icu_51.2.bb
new file mode 100644
index 0000000..1278d22
--- /dev/null
+++ b/meta-arago-distro/recipes-support/icu/icu_51.2.bb
@@ -0,0 +1,13 @@
+require icu.inc
+
+LIC_FILES_CHKSUM = "file://../license.html;md5=443a74288a72fad9069a74e7637192c1"
+
+PR = "r0"
+
+BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-51_2-src.tgz"
+SRC_URI = "${BASE_SRC_URI} \
+           file://icu-pkgdata-large-cmd.patch \
+          "
+
+SRC_URI[md5sum] = "072e501b87065f3a0ca888f1b5165709"
+SRC_URI[sha256sum] = "deb027a05f1b3bec03298b96fb93b28c84e9683c22e6f94effa67fdc7bd704cc"
-- 
1.8.3.2



  parent reply	other threads:[~2013-10-07 19:01 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-07 19:00 [PATCHv2 00/12] Add Qt5 support and update matrix-browser to use either Qt4 or Qt5 Denys Dmytriyenko
2013-10-07 19:00 ` [PATCH 01/12] arago-dylan-config: add meta-qt5/master and dependency on meta-ruby from meta-oe Denys Dmytriyenko
2013-10-07 19:00 ` [PATCHv2 02/12] matrix-gui-browser: replace ${S} with ${B} in do_install() Denys Dmytriyenko
2013-10-07 19:00 ` Denys Dmytriyenko [this message]
2013-10-07 19:00 ` [PATCH 04/12] icu: disable LDFLAGSICUDT that prevents loading libicudata.so Denys Dmytriyenko
2013-10-07 19:00 ` [PATCH 05/12] qtbase: configure and patch Qt5 qtbase for use with SGX in Arago Denys Dmytriyenko
2013-10-07 19:00 ` [PATCHv2 06/12] qtwebkit: add WebGL on eglfs patches Denys Dmytriyenko
2013-10-07 19:00 ` [PATCH 07/12] webkit-examples: enable building and packaging of examples Denys Dmytriyenko
2013-10-07 19:00 ` [PATCH 08/12] qt5.bbclass: add new class similar to existing qt4e for configuring recipes Denys Dmytriyenko
2013-10-07 19:00 ` [PATCH 09/12] qt-provider.bbclass: class to allow seamless switching between Qt4 and Qt5 Denys Dmytriyenko
2013-10-07 19:00 ` [PATCH 10/12] arago-prefs: load up Qt5 preferred versions Denys Dmytriyenko
2013-10-07 19:00 ` [PATCH 11/12] matrix-gui-browser: update recipe to be Qt4 and Qt5 compatible Denys Dmytriyenko
2013-10-07 19:00 ` [PATCHv2 12/12] arago-qt5-test-image: add test minimal image for testing Qt5 migration Denys Dmytriyenko
2013-10-08 14:11 ` [PATCHv2 00/12] Add Qt5 support and update matrix-browser to use either Qt4 or Qt5 Maupin, Chase
2013-10-08 15:31   ` Cooper Jr., Franklin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1381172427-18302-4-git-send-email-denis@denix.org \
    --to=denis@denix.org \
    --cc=meta-arago@arago-project.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.