diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-support/icu/icu')
4 files changed, 129 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch b/import-layers/yocto-poky/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch new file mode 100644 index 000000000..2968d571b --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch @@ -0,0 +1,28 @@ +From 0c82d6aa02c08e41b13c83b14782bd7024e25d59 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 15 Feb 2014 21:06:42 +0000 +Subject: [PATCH] Disable LDFLAGSICUDT for Linux + +Upstream-Status: Inappropriate [ OE Configuration ] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + source/config/mh-linux | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config/mh-linux b/config/mh-linux +index 366f0cc..2689aab 100644 +--- a/config/mh-linux ++++ b/config/mh-linux +@@ -21,7 +21,7 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN + LD_RPATH_PRE = -Wl,-rpath, + + ## These are the library specific LDFLAGS +-LDFLAGSICUDT=-nodefaultlibs -nostdlib ++# LDFLAGSICUDT=-nodefaultlibs -nostdlib + + ## Compiler switch to embed a library name + # The initial tab in the next line is to prevent icu-config from reading it. +-- +1.7.10.4 + diff --git a/import-layers/yocto-poky/meta/recipes-support/icu/icu/fix-install-manx.patch b/import-layers/yocto-poky/meta/recipes-support/icu/icu/fix-install-manx.patch new file mode 100644 index 000000000..ec63f50c4 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/icu/icu/fix-install-manx.patch @@ -0,0 +1,48 @@ +The generic recursive target calls target-local so also adding it to the +dependency list results in races due to install-local being executed twice in +parallel. For example, install-manx can fail if the two install processes race +and one process tries to chown a file that the other process has just deleted. + +Also install-manx should be a phony target, and for clarity use $^ instead of $? +in the install command. + +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@intel.com> + + +diff --git a/Makefile.in b/Makefile.in +index 9db6c52..3441afa 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -71,7 +71,7 @@ EXTRA_DATA = + + ## List of phony targets + .PHONY : all all-local all-recursive install install-local install-udata install-udata-files install-udata-dlls \ +-install-recursive clean clean-local clean-recursive distclean \ ++install-recursive install-manx clean clean-local clean-recursive distclean \ + distclean-local distclean-recursive doc dist dist-local dist-recursive \ + check check-local check-recursive clean-recursive-with-twist install-icu \ + doc install-doc tests icu4j-data icu4j-data-install update-windows-makefiles xcheck-local xcheck-recursive xperf xcheck xperf-recursive \ +@@ -82,10 +82,10 @@ check-exhaustive check-exhaustive-local check-exhaustive-recursive releaseDist + + ## List of standard targets + all: all-local all-recursive +-install: install-recursive install-local ++install: install-recursive + clean: clean-recursive-with-twist clean-local +-distclean : distclean-recursive distclean-local +-dist: dist-recursive dist-local ++distclean : distclean-recursive ++dist: dist-recursive + check: all check-recursive + check-recursive: all + xcheck: all xcheck-recursive +@@ -352,7 +352,7 @@ config.status: $(srcdir)/configure $(srcdir)/common/unicode/uvernum.h + + install-manx: $(MANX_FILES) + $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) +- $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION) ++ $(INSTALL_DATA) $^ $(DESTDIR)$(mandir)/man$(SECTION) + + config/%.$(SECTION): $(srcdir)/config/%.$(SECTION).in + cd $(top_builddir) \ diff --git a/import-layers/yocto-poky/meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch b/import-layers/yocto-poky/meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch new file mode 100644 index 000000000..6e4065922 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/icu/icu/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/import-layers/yocto-poky/meta/recipes-support/icu/icu/icu-release-56-1-flagparser-fix.patch b/import-layers/yocto-poky/meta/recipes-support/icu/icu/icu-release-56-1-flagparser-fix.patch new file mode 100644 index 000000000..1519d8469 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/icu/icu/icu-release-56-1-flagparser-fix.patch @@ -0,0 +1,24 @@ +icu: Ticket #11959: pkgdata dies when compiled with lots'o'flags + +See: http://bugs.icu-project.org/trac/ticket/11959 + +The patch avoids premature failure which results in a segfault. + +Upstream-Status: Backport of r38081 +Signed-off-by: Mike Crowe <mac@mcrowe.com> + +Index: source/tools/toolutil/flagparser.c +=================================================================== +--- source/tools/toolutil/flagparser.c (revision 38046) ++++ source/tools/toolutil/flagparser.c (working copy) +@@ -96,8 +96,8 @@ + uprv_free(buffer); + + T_FileStream_close(f); +- +- if (U_FAILURE(*status)) { ++ ++ if (U_FAILURE(*status) && *status != U_BUFFER_OVERFLOW_ERROR) { + return -1; + } + |