diff options
-rw-r--r-- | meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch | 11 | ||||
-rw-r--r-- | meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch | 9 | ||||
-rw-r--r-- | meta/recipes-support/icu/icu/fix-install-manx.patch | 7 | ||||
-rw-r--r-- | meta/recipes-support/icu/icu_74-2.bb (renamed from meta/recipes-support/icu/icu_74-1.bb) | 4 |
4 files changed, 13 insertions, 18 deletions
diff --git a/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch b/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch index 2968d571bb..c0e9e2806b 100644 --- a/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch +++ b/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 0c82d6aa02c08e41b13c83b14782bd7024e25d59 Mon Sep 17 00:00:00 2001 | 1 | From 0f4e9eee64bd4220aa4fae1ab4f7bbf10b87cd69 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 15 Feb 2014 21:06:42 +0000 | 3 | Date: Sat, 15 Feb 2014 21:06:42 +0000 |
4 | Subject: [PATCH] Disable LDFLAGSICUDT for Linux | 4 | Subject: [PATCH] Disable LDFLAGSICUDT for Linux |
@@ -7,14 +7,14 @@ Upstream-Status: Inappropriate [ OE Configuration ] | |||
7 | 7 | ||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
9 | --- | 9 | --- |
10 | source/config/mh-linux | 2 +- | 10 | config/mh-linux | 2 +- |
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
12 | 12 | ||
13 | diff --git a/config/mh-linux b/config/mh-linux | 13 | diff --git a/config/mh-linux b/config/mh-linux |
14 | index 366f0cc..2689aab 100644 | 14 | index 53d6780..b622513 100644 |
15 | --- a/config/mh-linux | 15 | --- a/config/mh-linux |
16 | +++ b/config/mh-linux | 16 | +++ b/config/mh-linux |
17 | @@ -21,7 +21,7 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN | 17 | @@ -23,7 +23,7 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN |
18 | LD_RPATH_PRE = -Wl,-rpath, | 18 | LD_RPATH_PRE = -Wl,-rpath, |
19 | 19 | ||
20 | ## These are the library specific LDFLAGS | 20 | ## These are the library specific LDFLAGS |
@@ -23,6 +23,3 @@ index 366f0cc..2689aab 100644 | |||
23 | 23 | ||
24 | ## Compiler switch to embed a library name | 24 | ## Compiler switch to embed a library name |
25 | # The initial tab in the next line is to prevent icu-config from reading it. | 25 | # The initial tab in the next line is to prevent icu-config from reading it. |
26 | -- | ||
27 | 1.7.10.4 | ||
28 | |||
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 578517b57f..a25285fb54 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 e3c25af4b40d64f098e7b8ae5a91fdc3c90163c4 Mon Sep 17 00:00:00 2001 | 1 | From cf55c077b77b7a219502364eaadf12c074ab005e 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,16 +8,15 @@ 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 | |||
12 | --- | 11 | --- |
13 | i18n/double-conversion-utils.h | 2 +- | 12 | i18n/double-conversion-utils.h | 2 +- |
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 14 | ||
16 | diff --git a/source/i18n/double-conversion-utils.h b/source/i18n/double-conversion-utils.h | 15 | diff --git a/i18n/double-conversion-utils.h b/i18n/double-conversion-utils.h |
17 | index 7f23e0a..7f89094 100644 | 16 | index 303668f..7d859dc 100644 |
18 | --- a/i18n/double-conversion-utils.h | 17 | --- a/i18n/double-conversion-utils.h |
19 | +++ b/i18n/double-conversion-utils.h | 18 | +++ b/i18n/double-conversion-utils.h |
20 | @@ -115,7 +115,7 @@ int main(int argc, char** argv) { | 19 | @@ -146,7 +146,7 @@ int main(int argc, char** argv) { |
21 | // | 20 | // |
22 | // If it prints "correct" then the architecture should be here, in the "correct" section. | 21 | // If it prints "correct" then the architecture should be here, in the "correct" section. |
23 | #if defined(_M_X64) || defined(__x86_64__) || \ | 22 | #if defined(_M_X64) || defined(__x86_64__) || \ |
diff --git a/meta/recipes-support/icu/icu/fix-install-manx.patch b/meta/recipes-support/icu/icu/fix-install-manx.patch index 925b064ebd..7526bde370 100644 --- a/meta/recipes-support/icu/icu/fix-install-manx.patch +++ b/meta/recipes-support/icu/icu/fix-install-manx.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a6ddabc8cadb76bfe2d2e374a6702442cfe51cce Mon Sep 17 00:00:00 2001 | 1 | From 2d544cac238eccbfc32cafc9502ddf6e00994211 Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Fri, 9 Oct 2015 17:50:41 +0100 | 3 | Date: Fri, 9 Oct 2015 17:50:41 +0100 |
4 | Subject: [PATCH] icu: fix install race | 4 | Subject: [PATCH] icu: fix install race |
@@ -13,13 +13,12 @@ in the install command. | |||
13 | 13 | ||
14 | Upstream-Status: Pending | 14 | Upstream-Status: Pending |
15 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 15 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
16 | |||
17 | --- | 16 | --- |
18 | source/Makefile.in | 8 ++++---- | 17 | Makefile.in | 8 ++++---- |
19 | 1 file changed, 4 insertions(+), 4 deletions(-) | 18 | 1 file changed, 4 insertions(+), 4 deletions(-) |
20 | 19 | ||
21 | diff --git a/Makefile.in b/Makefile.in | 20 | diff --git a/Makefile.in b/Makefile.in |
22 | index be9435b..ada20d7 100644 | 21 | index 8366f01..79b91c9 100644 |
23 | --- a/Makefile.in | 22 | --- a/Makefile.in |
24 | +++ b/Makefile.in | 23 | +++ b/Makefile.in |
25 | @@ -77,7 +77,7 @@ EXTRA_DATA = | 24 | @@ -77,7 +77,7 @@ EXTRA_DATA = |
diff --git a/meta/recipes-support/icu/icu_74-1.bb b/meta/recipes-support/icu/icu_74-2.bb index 88ded166b5..8352bf2a5b 100644 --- a/meta/recipes-support/icu/icu_74-1.bb +++ b/meta/recipes-support/icu/icu_74-2.bb | |||
@@ -111,8 +111,8 @@ SRC_URI = "${BASE_SRC_URI};name=code \ | |||
111 | SRC_URI:append:class-target = "\ | 111 | SRC_URI:append:class-target = "\ |
112 | file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ | 112 | file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ |
113 | " | 113 | " |
114 | SRC_URI[code.sha256sum] = "86ce8e60681972e60e4dcb2490c697463fcec60dd400a5f9bffba26d0b52b8d0" | 114 | SRC_URI[code.sha256sum] = "68db082212a96d6f53e35d60f47d38b962e9f9d207a74cfac78029ae8ff5e08c" |
115 | SRC_URI[data.sha256sum] = "67d5ab39c5187e1dd0fed60a3fe52794dce9784b4c045cb85e19f5d317fd783f" | 115 | SRC_URI[data.sha256sum] = "c28c3ca5f4ba3384781797138a294ca360988d4322674ad4d51e52f5d9b0a2b6" |
116 | 116 | ||
117 | UPSTREAM_CHECK_REGEX = "releases/tag/release-(?P<pver>(?!.+rc).+)" | 117 | UPSTREAM_CHECK_REGEX = "releases/tag/release-(?P<pver>(?!.+rc).+)" |
118 | GITHUB_BASE_URI = "https://github.com/unicode-org/icu/releases" | 118 | GITHUB_BASE_URI = "https://github.com/unicode-org/icu/releases" |