diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2021-02-17 00:01:30 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-04 17:39:10 +0000 |
commit | 15496693ede24fcab5bdd89e03f60e26e6350853 (patch) | |
tree | c2aad65245a849604163bb98705152b65b3051b1 /meta/recipes-support/icu | |
parent | 42385075ebb1567656693ba9e4a1d52c0be2c6e9 (diff) | |
download | poky-15496693ede24fcab5bdd89e03f60e26e6350853.tar.gz |
icu: backport fix for rare random genrb segmentation fault
* sometimes I've seen it also reporting "Bus error" instead of segmentation fault
* upstream bug report:
https://unicode-org.atlassian.net/browse/ICU-21175
* on 80 core machine it failed 11 times in 1000 rebuilds of icu in various files:
icu.019.stderr.compile:make[1]: *** [out/build/icudt66l/windowsZones.res] Segmentation fault
icu.035.stderr.compile:make[1]: *** [out/build/icudt66l/supplementalData.res] Segmentation fault
icu.095.stderr.compile:make[1]: *** [out/build/icudt66l/plurals.res] Segmentation fault
icu.116.stderr.compile:make[1]: *** [out/build/icudt66l/curr/supplementalData.res] Segmentation fault
icu.313.stderr.compile:make[1]: *** [out/build/icudt66l/supplementalData.res] Segmentation fault
icu.415.stderr.compile:make[1]: *** [out/build/icudt66l/supplementalData.res] Segmentation fault
icu.476.stderr.compile:make[1]: *** [out/build/icudt66l/metadata.res] Segmentation fault
icu.495.stderr.compile:make[1]: *** [out/build/icudt66l/supplementalData.res] Segmentation fault
icu.496.stderr.compile:make[1]: *** [out/build/icudt66l/supplementalData.res] Segmentation fault
icu.505.stderr.compile:make[1]: *** [out/build/icudt66l/pluralRanges.res] Segmentation fault
icu.756.stderr.compile:make[1]: *** [out/build/icudt66l/numberingSystems.res] Segmentation fault
* apply 0001-Fix-big-endian-build.patch in do_patch like this new patch
(From OE-Core rev: 00af6882a24ca69f9e8147546a220dc73e4d6087)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/icu')
-rw-r--r-- | meta/recipes-support/icu/icu/0002-ICU-21175-Add-cnvalias-as-a-dependency-of-misc_res.patch | 24 | ||||
-rw-r--r-- | meta/recipes-support/icu/icu_66.1.bb | 4 |
2 files changed, 26 insertions, 2 deletions
diff --git a/meta/recipes-support/icu/icu/0002-ICU-21175-Add-cnvalias-as-a-dependency-of-misc_res.patch b/meta/recipes-support/icu/icu/0002-ICU-21175-Add-cnvalias-as-a-dependency-of-misc_res.patch new file mode 100644 index 0000000000..d7ddf33bce --- /dev/null +++ b/meta/recipes-support/icu/icu/0002-ICU-21175-Add-cnvalias-as-a-dependency-of-misc_res.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | From f2bc064e0d70ac068de4539d069bfab6cdccc48d Mon Sep 17 00:00:00 2001 | ||
2 | From: "Shane F. Carr" <shane@unicode.org> | ||
3 | Date: Fri, 10 Jul 2020 14:28:22 -0500 | ||
4 | Subject: [PATCH] ICU-21175 Add cnvalias as a dependency of misc_res | ||
5 | |||
6 | Upstream-Status: Backport [https://github.com/unicode-org/icu/commit/ee2d8b01034c3101de2bd58f9328daa076995e9e] | ||
7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
8 | --- | ||
9 | data/BUILDRULES.py | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/data/BUILDRULES.py b/data/BUILDRULES.py | ||
13 | index 2338afd1f7..63b6e09273 100644 | ||
14 | --- a/data/BUILDRULES.py | ||
15 | +++ b/data/BUILDRULES.py | ||
16 | @@ -361,7 +361,7 @@ def generate_misc(config, io, common_vars): | ||
17 | RepeatedExecutionRequest( | ||
18 | name = "misc_res", | ||
19 | category = "misc", | ||
20 | - dep_targets = [], | ||
21 | + dep_targets = [DepTarget("cnvalias")], # ICU-21175 | ||
22 | input_files = input_files, | ||
23 | output_files = output_files, | ||
24 | tool = IcuTool("genrb"), | ||
diff --git a/meta/recipes-support/icu/icu_66.1.bb b/meta/recipes-support/icu/icu_66.1.bb index 08254648e4..6ba88595df 100644 --- a/meta/recipes-support/icu/icu_66.1.bb +++ b/meta/recipes-support/icu/icu_66.1.bb | |||
@@ -21,10 +21,11 @@ BASE_SRC_URI = "https://github.com/unicode-org/icu/releases/download/release-${I | |||
21 | DATA_SRC_URI = "https://github.com/unicode-org/icu/releases/download/release-${ICU_FOLDER}/icu4c-${ICU_PV}-data.zip" | 21 | DATA_SRC_URI = "https://github.com/unicode-org/icu/releases/download/release-${ICU_FOLDER}/icu4c-${ICU_PV}-data.zip" |
22 | SRC_URI = "${BASE_SRC_URI};name=code \ | 22 | SRC_URI = "${BASE_SRC_URI};name=code \ |
23 | ${DATA_SRC_URI};name=data \ | 23 | ${DATA_SRC_URI};name=data \ |
24 | file://0001-Fix-big-endian-build.patch;patchdir=${WORKDIR} \ | ||
25 | file://0002-ICU-21175-Add-cnvalias-as-a-dependency-of-misc_res.patch;patchdir=${WORKDIR} \ | ||
24 | file://filter.json \ | 26 | file://filter.json \ |
25 | file://icu-pkgdata-large-cmd.patch \ | 27 | file://icu-pkgdata-large-cmd.patch \ |
26 | file://fix-install-manx.patch \ | 28 | file://fix-install-manx.patch \ |
27 | file://0001-Fix-big-endian-build.patch;apply=no \ | ||
28 | file://0001-icu-Added-armeb-support.patch \ | 29 | file://0001-icu-Added-armeb-support.patch \ |
29 | file://CVE-2020-10531.patch \ | 30 | file://CVE-2020-10531.patch \ |
30 | " | 31 | " |
@@ -47,7 +48,6 @@ do_make_icudata_class-target () { | |||
47 | cd ${S} | 48 | cd ${S} |
48 | rm -rf data | 49 | rm -rf data |
49 | cp -a ${WORKDIR}/data . | 50 | cp -a ${WORKDIR}/data . |
50 | patch -p1 < ${WORKDIR}/0001-Fix-big-endian-build.patch | ||
51 | ${@bb.utils.contains('PACKAGECONFIG', 'make-icudata', '', 'exit 0', d)} | 51 | ${@bb.utils.contains('PACKAGECONFIG', 'make-icudata', '', 'exit 0', d)} |
52 | AR='${BUILD_AR}' \ | 52 | AR='${BUILD_AR}' \ |
53 | CC='${BUILD_CC}' \ | 53 | CC='${BUILD_CC}' \ |