Acked-by: Chase Maupin <[email protected]>
>-----Original Message----- >From: [email protected] [mailto:meta-arago- >[email protected]] On Behalf Of Denys Dmytriyenko >Sent: Wednesday, April 23, 2014 8:51 PM >To: [email protected] >Subject: [meta-arago] [PATCH 6/8] icu: replace overlayed recipe >with bbappend for 1 patch > >From: Denys Dmytriyenko <[email protected]> > >Signed-off-by: Denys Dmytriyenko <[email protected]> >--- > .../icu/icu-51.2/icu-pkgdata-large-cmd.patch | 29 --------- >--- > meta-arago-distro/recipes-support/icu/icu.inc | 55 --------- >------------- > .../{icu-51.2 => icu}/disable-ldflagsicudt.patch | 0 > meta-arago-distro/recipes-support/icu/icu_51.2.bb | 14 ------ > .../recipes-support/icu/icu_51.2.bbappend | 5 ++ > 5 files changed, 5 insertions(+), 98 deletions(-) > delete mode 100644 meta-arago-distro/recipes-support/icu/icu- >51.2/icu-pkgdata-large-cmd.patch > delete mode 100644 meta-arago-distro/recipes-support/icu/icu.inc > rename meta-arago-distro/recipes-support/icu/{icu-51.2 => >icu}/disable-ldflagsicudt.patch (100%) > delete mode 100644 meta-arago-distro/recipes- >support/icu/icu_51.2.bb > create mode 100644 meta-arago-distro/recipes- >support/icu/icu_51.2.bbappend > >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 >deleted file mode 100644 >index 6e40659..0000000 >--- a/meta-arago-distro/recipes-support/icu/icu-51.2/icu-pkgdata- >large-cmd.patch >+++ /dev/null >@@ -1,29 +0,0 @@ >-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 <[email protected]> >---- >- 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 >deleted file mode 100644 >index e3944cd..0000000 >--- a/meta-arago-distro/recipes-support/icu/icu.inc >+++ /dev/null >@@ -1,55 +0,0 @@ >-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/disable-ldflagsicudt.patch b/meta-arago-distro/recipes- >support/icu/icu/disable-ldflagsicudt.patch >similarity index 100% >rename from meta-arago-distro/recipes-support/icu/icu- >51.2/disable-ldflagsicudt.patch >rename to meta-arago-distro/recipes-support/icu/icu/disable- >ldflagsicudt.patch >diff --git a/meta-arago-distro/recipes-support/icu/icu_51.2.bb >b/meta-arago-distro/recipes-support/icu/icu_51.2.bb >deleted file mode 100644 >index 9a6fd70..0000000 >--- a/meta-arago-distro/recipes-support/icu/icu_51.2.bb >+++ /dev/null >@@ -1,14 +0,0 @@ >-require icu.inc >- >-LIC_FILES_CHKSUM = >"file://../license.html;md5=443a74288a72fad9069a74e7637192c1" >- >-PR = "r1" >- >-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 \ >- file://disable-ldflagsicudt.patch \ >- " >- >-SRC_URI[md5sum] = "072e501b87065f3a0ca888f1b5165709" >-SRC_URI[sha256sum] = >"deb027a05f1b3bec03298b96fb93b28c84e9683c22e6f94effa67fdc7bd704cc" >diff --git a/meta-arago-distro/recipes- >support/icu/icu_51.2.bbappend b/meta-arago-distro/recipes- >support/icu/icu_51.2.bbappend >new file mode 100644 >index 0000000..f812148 >--- /dev/null >+++ b/meta-arago-distro/recipes-support/icu/icu_51.2.bbappend >@@ -0,0 +1,5 @@ >+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" >+ >+PR_append = "-arago0" >+ >+SRC_URI += "file://disable-ldflagsicudt.patch" >-- >1.9.2 > >_______________________________________________ >meta-arago mailing list >[email protected] >http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
