diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-11-14 16:57:49 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-30 10:49:22 +0000 |
commit | 7c71c15b9fa3dc840007792b70b1c4ec664ef1d5 (patch) | |
tree | 2a24fc032714aafecb0024126dc675b0f8ff7d72 /meta/recipes-support/icu/icu/fix-install-manx.patch | |
parent | d4102074035c708b04792a02e5d9bbcc9ee4a0af (diff) | |
download | poky-7c71c15b9fa3dc840007792b70b1c4ec664ef1d5.tar.gz |
icu: update to 60.1
Rebase a couple of patches.
LICENSE checksum change due to typo fix.
(From OE-Core rev: d4a76a51762d094d6f4fc016c52a6817c7f92637)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 @@ | |||
1 | From 3063a9211669bee673840ee81f81d30699b9b702 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@intel.com> | ||
3 | Date: Fri, 9 Oct 2015 17:50:41 +0100 | ||
4 | Subject: [PATCH 2/4] icu: fix install race | ||
5 | |||
1 | The generic recursive target calls target-local so also adding it to the | 6 | The generic recursive target calls target-local so also adding it to the |
2 | dependency list results in races due to install-local being executed twice in | 7 | dependency list results in races due to install-local being executed twice in |
3 | parallel. For example, install-manx can fail if the two install processes race | 8 | parallel. For example, install-manx can fail if the two install processes race |
@@ -9,12 +14,15 @@ in the install command. | |||
9 | Upstream-Status: Pending | 14 | Upstream-Status: Pending |
10 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 15 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
11 | 16 | ||
17 | --- | ||
18 | source/Makefile.in | 8 ++++---- | ||
19 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
12 | 20 | ||
13 | diff --git a/Makefile.in b/Makefile.in | 21 | diff --git a/source/Makefile.in b/source/Makefile.in |
14 | index 9db6c52..3441afa 100644 | 22 | index c1db15b..4948deb 100644 |
15 | --- a/Makefile.in | 23 | --- a/Makefile.in |
16 | +++ b/Makefile.in | 24 | +++ b/Makefile.in |
17 | @@ -71,7 +71,7 @@ EXTRA_DATA = | 25 | @@ -73,7 +73,7 @@ EXTRA_DATA = |
18 | 26 | ||
19 | ## List of phony targets | 27 | ## List of phony targets |
20 | .PHONY : all all-local all-recursive install install-local install-udata install-udata-files install-udata-dlls \ | 28 | .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 | |||
23 | distclean-local distclean-recursive doc dist dist-local dist-recursive \ | 31 | distclean-local distclean-recursive doc dist dist-local dist-recursive \ |
24 | check check-local check-recursive clean-recursive-with-twist install-icu \ | 32 | check check-local check-recursive clean-recursive-with-twist install-icu \ |
25 | doc install-doc tests icu4j-data icu4j-data-install update-windows-makefiles xcheck-local xcheck-recursive xperf xcheck xperf-recursive \ | 33 | doc install-doc tests icu4j-data icu4j-data-install update-windows-makefiles xcheck-local xcheck-recursive xperf xcheck xperf-recursive \ |
26 | @@ -82,10 +82,10 @@ check-exhaustive check-exhaustive-local check-exhaustive-recursive releaseDist | 34 | @@ -84,9 +84,9 @@ check-exhaustive check-exhaustive-local check-exhaustive-recursive releaseDist |
27 | 35 | ||
28 | ## List of standard targets | 36 | ## List of standard targets |
29 | all: all-local all-recursive | 37 | all: all-local all-recursive |
@@ -31,13 +39,11 @@ index 9db6c52..3441afa 100644 | |||
31 | +install: install-recursive | 39 | +install: install-recursive |
32 | clean: clean-recursive-with-twist clean-local | 40 | clean: clean-recursive-with-twist clean-local |
33 | -distclean : distclean-recursive distclean-local | 41 | -distclean : distclean-recursive distclean-local |
34 | -dist: dist-recursive dist-local | ||
35 | +distclean : distclean-recursive | 42 | +distclean : distclean-recursive |
36 | +dist: dist-recursive | 43 | dist: dist-recursive |
37 | check: all check-recursive | 44 | check: all check-recursive |
38 | check-recursive: all | 45 | check-recursive: all |
39 | xcheck: all xcheck-recursive | 46 | @@ -350,7 +350,7 @@ config.status: $(srcdir)/configure $(srcdir)/common/unicode/uvernum.h |
40 | @@ -352,7 +352,7 @@ config.status: $(srcdir)/configure $(srcdir)/common/unicode/uvernum.h | ||
41 | 47 | ||
42 | install-manx: $(MANX_FILES) | 48 | install-manx: $(MANX_FILES) |
43 | $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) | 49 | $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) |
@@ -46,3 +52,6 @@ index 9db6c52..3441afa 100644 | |||
46 | 52 | ||
47 | config/%.$(SECTION): $(srcdir)/config/%.$(SECTION).in | 53 | config/%.$(SECTION): $(srcdir)/config/%.$(SECTION).in |
48 | cd $(top_builddir) \ | 54 | cd $(top_builddir) \ |
55 | -- | ||
56 | 2.14.2 | ||
57 | |||