diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-11-02 09:42:57 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-03 11:12:25 +0000 |
commit | 5b543a7e72503dd2727a59998de9f41da53a94c8 (patch) | |
tree | b912c8637a2a1398c5d00a72c5eb7c3b22da27ec /meta/recipes-support | |
parent | c537fbff6807d2c4896bb4a5834f1005f85cbc34 (diff) | |
download | poky-5b543a7e72503dd2727a59998de9f41da53a94c8.tar.gz |
icu: update 69.1 -> 70.1
License-Update: formatting, updated copyright holders
(From OE-Core rev: dc4b988fa3bc53028bed1a2245de36003690a23c)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch | 12 | ||||
-rw-r--r-- | meta/recipes-support/icu/icu_70.1.bb (renamed from meta/recipes-support/icu/icu_69.1.bb) | 10 |
2 files changed, 10 insertions, 12 deletions
diff --git a/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch b/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch index c5dc0611c2..578517b57f 100644 --- a/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch +++ b/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 500321387ceca48934bb0f323779117cd518bab6 Mon Sep 17 00:00:00 2001 | 1 | From e3c25af4b40d64f098e7b8ae5a91fdc3c90163c4 Mon Sep 17 00:00:00 2001 |
2 | From: Lei Maohui <leimaohui@cn.fujitsu.com> | 2 | From: Lei Maohui <leimaohui@cn.fujitsu.com> |
3 | Date: Wed, 8 May 2019 14:42:30 +0900 | 3 | Date: Wed, 8 May 2019 14:42:30 +0900 |
4 | Subject: [PATCH] icu: Added armeb support. | 4 | Subject: [PATCH] icu: Added armeb support. |
@@ -8,12 +8,13 @@ Make icu support arm32 BE. | |||
8 | Upstream-Status: Pending | 8 | Upstream-Status: Pending |
9 | 9 | ||
10 | Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> | 10 | Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> |
11 | |||
11 | --- | 12 | --- |
12 | i18n/double-conversion-utils.h | 2 +- | 13 | i18n/double-conversion-utils.h | 2 +- |
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
14 | 15 | ||
15 | diff --git a/i18n/double-conversion-utils.h b/i18n/double-conversion-utils.h | 16 | diff --git a/source/i18n/double-conversion-utils.h b/source/i18n/double-conversion-utils.h |
16 | index c937463..feaad0f 100644 | 17 | index 7f23e0a..7f89094 100644 |
17 | --- a/i18n/double-conversion-utils.h | 18 | --- a/i18n/double-conversion-utils.h |
18 | +++ b/i18n/double-conversion-utils.h | 19 | +++ b/i18n/double-conversion-utils.h |
19 | @@ -115,7 +115,7 @@ int main(int argc, char** argv) { | 20 | @@ -115,7 +115,7 @@ int main(int argc, char** argv) { |
@@ -24,7 +25,4 @@ index c937463..feaad0f 100644 | |||
24 | + defined(__arm__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \ | 25 | + defined(__arm__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \ |
25 | defined(__hppa__) || defined(__ia64__) || \ | 26 | defined(__hppa__) || defined(__ia64__) || \ |
26 | defined(__mips__) || \ | 27 | defined(__mips__) || \ |
27 | defined(__nios2__) || defined(__ghs) || \ | 28 | defined(__loongarch__) || \ |
28 | -- | ||
29 | 2.25.1 | ||
30 | |||
diff --git a/meta/recipes-support/icu/icu_69.1.bb b/meta/recipes-support/icu/icu_70.1.bb index 4daf0fe82e..0988ae8b8e 100644 --- a/meta/recipes-support/icu/icu_69.1.bb +++ b/meta/recipes-support/icu/icu_70.1.bb | |||
@@ -6,8 +6,8 @@ same results on all platforms." | |||
6 | HOMEPAGE = "http://site.icu-project.org/" | 6 | HOMEPAGE = "http://site.icu-project.org/" |
7 | 7 | ||
8 | LICENSE = "ICU" | 8 | LICENSE = "ICU" |
9 | DEPENDS = "icu-native" | 9 | DEPENDS = "icu-native autoconf-archive" |
10 | DEPENDS:class-native = "" | 10 | DEPENDS:class-native = "autoconf-archive-native" |
11 | 11 | ||
12 | CVE_PRODUCT = "international_components_for_unicode" | 12 | CVE_PRODUCT = "international_components_for_unicode" |
13 | 13 | ||
@@ -83,7 +83,7 @@ FILES:libicuio = "${libdir}/libicuio.so.*" | |||
83 | 83 | ||
84 | BBCLASSEXTEND = "native nativesdk" | 84 | BBCLASSEXTEND = "native nativesdk" |
85 | 85 | ||
86 | LIC_FILES_CHKSUM = "file://../LICENSE;md5=002d2fdc32d17f0ec06e9a47f2c0c8d0" | 86 | LIC_FILES_CHKSUM = "file://../LICENSE;md5=dc9d616e558490c389609a0e8b81ae6d" |
87 | 87 | ||
88 | def icu_download_version(d): | 88 | def icu_download_version(d): |
89 | pvsplit = d.getVar('PV').split('.') | 89 | pvsplit = d.getVar('PV').split('.') |
@@ -112,8 +112,8 @@ SRC_URI = "${BASE_SRC_URI};name=code \ | |||
112 | SRC_URI:append:class-target = "\ | 112 | SRC_URI:append:class-target = "\ |
113 | file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ | 113 | file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ |
114 | " | 114 | " |
115 | SRC_URI[code.sha256sum] = "4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745" | 115 | SRC_URI[code.sha256sum] = "8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5" |
116 | SRC_URI[data.sha256sum] = "4fc2d8cfc3343673123586fca3967404abd4e346fba5515829204533b3bae4bf" | 116 | SRC_URI[data.sha256sum] = "c72723ddba3300ffb231d6b09e2a728ea6e89de10ed5927f74bacbd77042336e" |
117 | 117 | ||
118 | UPSTREAM_CHECK_REGEX = "icu4c-(?P<pver>\d+(_\d+)+)-src" | 118 | UPSTREAM_CHECK_REGEX = "icu4c-(?P<pver>\d+(_\d+)+)-src" |
119 | UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases" | 119 | UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases" |