diff options
Diffstat (limited to 'meta/recipes-support/icu/icu/fix-install-manx.patch')
| -rw-r--r-- | meta/recipes-support/icu/icu/fix-install-manx.patch | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/meta/recipes-support/icu/icu/fix-install-manx.patch b/meta/recipes-support/icu/icu/fix-install-manx.patch index ec63f50c46..8186fb4122 100644 --- a/meta/recipes-support/icu/icu/fix-install-manx.patch +++ b/meta/recipes-support/icu/icu/fix-install-manx.patch @@ -1,3 +1,8 @@ +From 3063a9211669bee673840ee81f81d30699b9b702 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Fri, 9 Oct 2015 17:50:41 +0100 +Subject: [PATCH 2/4] icu: fix install race + 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 @@ -9,12 +14,15 @@ in the install command. Upstream-Status: Pending Signed-off-by: Ross Burton <ross.burton@intel.com> +--- + source/Makefile.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/Makefile.in b/Makefile.in -index 9db6c52..3441afa 100644 +diff --git a/source/Makefile.in b/source/Makefile.in +index c1db15b..4948deb 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -71,7 +71,7 @@ EXTRA_DATA = +@@ -73,7 +73,7 @@ EXTRA_DATA = ## List of phony targets .PHONY : all all-local all-recursive install install-local install-udata install-udata-files install-udata-dlls \ @@ -23,7 +31,7 @@ index 9db6c52..3441afa 100644 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 +@@ -84,9 +84,9 @@ check-exhaustive check-exhaustive-local check-exhaustive-recursive releaseDist ## List of standard targets all: all-local all-recursive @@ -31,13 +39,11 @@ index 9db6c52..3441afa 100644 +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 + 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 +@@ -350,7 +350,7 @@ config.status: $(srcdir)/configure $(srcdir)/common/unicode/uvernum.h install-manx: $(MANX_FILES) $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) @@ -46,3 +52,6 @@ index 9db6c52..3441afa 100644 config/%.$(SECTION): $(srcdir)/config/%.$(SECTION).in cd $(top_builddir) \ +-- +2.14.2 + |