diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2018-11-22 16:41:27 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-11-22 16:15:10 +0000 |
commit | 12765813bda38efe2a8ace2d7e56c32882530268 (patch) | |
tree | 6c57fbc0d7a65f9632b1a5bfb36fd5762e6f5aef /meta/recipes-support | |
parent | 7fa0996f39f55dbc3c4441d8df7ff2aff17fc6b7 (diff) | |
download | openembedded-core-contrib-12765813bda38efe2a8ace2d7e56c32882530268.tar.gz |
icu: update to 63.1
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/icu/icu/fix-install-manx.patch | 21 | ||||
-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 @@ -From 3063a9211669bee673840ee81f81d30699b9b702 Mon Sep 17 00:00:00 2001 +From a6ddabc8cadb76bfe2d2e374a6702442cfe51cce 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 +Subject: [PATCH] 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 @@ -18,11 +18,11 @@ Signed-off-by: Ross Burton <ross.burton@intel.com> source/Makefile.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/source/Makefile.in b/source/Makefile.in -index c1db15b..4948deb 100644 +diff --git a/Makefile.in b/Makefile.in +index be9435b..ada20d7 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -73,7 +73,7 @@ EXTRA_DATA = +@@ -77,7 +77,7 @@ EXTRA_DATA = ## List of phony targets .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 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 \ -@@ -84,9 +84,9 @@ check-exhaustive check-exhaustive-local check-exhaustive-recursive releaseDist +@@ -88,9 +88,9 @@ check-exhaustive check-exhaustive-local check-exhaustive-recursive releaseDist ## List of standard targets all: all-local all-recursive @@ -43,15 +43,12 @@ index c1db15b..4948deb 100644 dist: dist-recursive check: all check-recursive check-recursive: all -@@ -350,7 +350,7 @@ config.status: $(srcdir)/configure $(srcdir)/common/unicode/uvernum.h - +@@ -357,7 +357,7 @@ config.status: $(srcdir)/configure $(srcdir)/common/unicode/uvernum.h install-manx: $(MANX_FILES) $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) + ifneq ($(MANX_FILES),) - $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION) + $(INSTALL_DATA) $^ $(DESTDIR)$(mandir)/man$(SECTION) + endif config/%.$(SECTION): $(srcdir)/config/%.$(SECTION).in - cd $(top_builddir) \ --- -2.14.2 - 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} \ SRC_URI_append_class-target = "\ file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ " -SRC_URI[md5sum] = "490ad9d920158e0314e10ba74ae9a150" -SRC_URI[sha256sum] = "3dd9868d666350dda66a6e305eecde9d479fb70b30d5b55d78a1deffb97d5aa3" +SRC_URI[md5sum] = "9e40f6055294284df958200e308bce50" +SRC_URI[sha256sum] = "05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/" UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/" |