summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2018-11-22 16:41:27 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-23 23:35:18 +0000
commit2a96011a42a665c681522e0f8be027ad82feb0d9 (patch)
tree10ca974fcb3ef606a9df350879de9d0698f0800d
parenta15b8cb1fe359510c1a9ae2a88381e87549f92eb (diff)
downloadpoky-2a96011a42a665c681522e0f8be027ad82feb0d9.tar.gz
icu: update to 63.1
(From OE-Core rev: 12765813bda38efe2a8ace2d7e56c32882530268) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/icu/icu/fix-install-manx.patch21
-rw-r--r--meta/recipes-support/icu/icu_63.1.bb (renamed from meta/recipes-support/icu/icu_62.1.bb)4
2 files changed, 11 insertions, 14 deletions
diff --git a/meta/recipes-support/icu/icu/fix-install-manx.patch b/meta/recipes-support/icu/icu/fix-install-manx.patch
index 8186fb4122..925b064ebd 100644
--- a/meta/recipes-support/icu/icu/fix-install-manx.patch
+++ b/meta/recipes-support/icu/icu/fix-install-manx.patch
@@ -1,7 +1,7 @@
1From 3063a9211669bee673840ee81f81d30699b9b702 Mon Sep 17 00:00:00 2001 1From a6ddabc8cadb76bfe2d2e374a6702442cfe51cce Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com> 2From: Ross Burton <ross.burton@intel.com>
3Date: Fri, 9 Oct 2015 17:50:41 +0100 3Date: Fri, 9 Oct 2015 17:50:41 +0100
4Subject: [PATCH 2/4] icu: fix install race 4Subject: [PATCH] icu: fix install race
5 5
6The generic recursive target calls target-local so also adding it to the 6The generic recursive target calls target-local so also adding it to the
7dependency list results in races due to install-local being executed twice in 7dependency list results in races due to install-local being executed twice in
@@ -18,11 +18,11 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
18 source/Makefile.in | 8 ++++---- 18 source/Makefile.in | 8 ++++----
19 1 file changed, 4 insertions(+), 4 deletions(-) 19 1 file changed, 4 insertions(+), 4 deletions(-)
20 20
21diff --git a/source/Makefile.in b/source/Makefile.in 21diff --git a/Makefile.in b/Makefile.in
22index c1db15b..4948deb 100644 22index be9435b..ada20d7 100644
23--- a/Makefile.in 23--- a/Makefile.in
24+++ b/Makefile.in 24+++ b/Makefile.in
25@@ -73,7 +73,7 @@ EXTRA_DATA = 25@@ -77,7 +77,7 @@ EXTRA_DATA =
26 26
27 ## List of phony targets 27 ## List of phony targets
28 .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 \
@@ -31,7 +31,7 @@ index c1db15b..4948deb 100644
31 distclean-local distclean-recursive doc dist dist-local dist-recursive \ 31 distclean-local distclean-recursive doc dist dist-local dist-recursive \
32 check check-local check-recursive clean-recursive-with-twist install-icu \ 32 check check-local check-recursive clean-recursive-with-twist install-icu \
33 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 \
34@@ -84,9 +84,9 @@ check-exhaustive check-exhaustive-local check-exhaustive-recursive releaseDist 34@@ -88,9 +88,9 @@ check-exhaustive check-exhaustive-local check-exhaustive-recursive releaseDist
35 35
36 ## List of standard targets 36 ## List of standard targets
37 all: all-local all-recursive 37 all: all-local all-recursive
@@ -43,15 +43,12 @@ index c1db15b..4948deb 100644
43 dist: dist-recursive 43 dist: dist-recursive
44 check: all check-recursive 44 check: all check-recursive
45 check-recursive: all 45 check-recursive: all
46@@ -350,7 +350,7 @@ config.status: $(srcdir)/configure $(srcdir)/common/unicode/uvernum.h 46@@ -357,7 +357,7 @@ config.status: $(srcdir)/configure $(srcdir)/common/unicode/uvernum.h
47
48 install-manx: $(MANX_FILES) 47 install-manx: $(MANX_FILES)
49 $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) 48 $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
49 ifneq ($(MANX_FILES),)
50- $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION) 50- $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION)
51+ $(INSTALL_DATA) $^ $(DESTDIR)$(mandir)/man$(SECTION) 51+ $(INSTALL_DATA) $^ $(DESTDIR)$(mandir)/man$(SECTION)
52 endif
52 53
53 config/%.$(SECTION): $(srcdir)/config/%.$(SECTION).in 54 config/%.$(SECTION): $(srcdir)/config/%.$(SECTION).in
54 cd $(top_builddir) \
55--
562.14.2
57
diff --git a/meta/recipes-support/icu/icu_62.1.bb b/meta/recipes-support/icu/icu_63.1.bb
index 4e3750b997..e593dc1bdb 100644
--- a/meta/recipes-support/icu/icu_62.1.bb
+++ b/meta/recipes-support/icu/icu_63.1.bb
@@ -22,8 +22,8 @@ SRC_URI = "${BASE_SRC_URI} \
22SRC_URI_append_class-target = "\ 22SRC_URI_append_class-target = "\
23 file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ 23 file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \
24 " 24 "
25SRC_URI[md5sum] = "490ad9d920158e0314e10ba74ae9a150" 25SRC_URI[md5sum] = "9e40f6055294284df958200e308bce50"
26SRC_URI[sha256sum] = "3dd9868d666350dda66a6e305eecde9d479fb70b30d5b55d78a1deffb97d5aa3" 26SRC_URI[sha256sum] = "05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d"
27 27
28UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/" 28UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/"
29UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/" 29UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/"