diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-09-06 18:09:05 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-09-06 17:13:19 +0100 |
commit | 58f7950896d0d9c1a313559e4de0ba3d4b10cc7f (patch) | |
tree | a08802424d5a53870b8f264e9c4060743115b49b | |
parent | b8eb4b65cd9cb3f3d3a71fa632cd1db48a166538 (diff) | |
download | poky-58f7950896d0d9c1a313559e4de0ba3d4b10cc7f.tar.gz |
icu: Fix build with glibc 2.26
(From OE-Core rev: 564209df3d0fd87742ffccb7475b8908c4a7efa4)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch | 31 | ||||
-rw-r--r-- | meta/recipes-support/icu/icu_58.2.bb | 3 |
2 files changed, 33 insertions, 1 deletions
diff --git a/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch b/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch new file mode 100644 index 0000000000..add0d765b7 --- /dev/null +++ b/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From c4254fd8ff1888ca285e3242b812010357ce2b3e Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 24 Jun 2017 22:52:40 -0700 | ||
4 | Subject: [PATCH] i18n: Drop include <xlocale.h> | ||
5 | |||
6 | glibc 2.26 drops this header | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | Upstream-Status: Pending | ||
11 | |||
12 | i18n/digitlst.cpp | 6 +----- | ||
13 | 1 file changed, 1 insertion(+), 5 deletions(-) | ||
14 | |||
15 | Index: source/i18n/digitlst.cpp | ||
16 | =================================================================== | ||
17 | --- source.orig/i18n/digitlst.cpp | ||
18 | +++ source/i18n/digitlst.cpp | ||
19 | @@ -61,11 +61,7 @@ | ||
20 | #endif | ||
21 | |||
22 | #if U_USE_STRTOD_L | ||
23 | -# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN | ||
24 | -# include <locale.h> | ||
25 | -# else | ||
26 | -# include <xlocale.h> | ||
27 | -# endif | ||
28 | +# include <locale.h> | ||
29 | #endif | ||
30 | |||
31 | // *************************************************************************** | ||
diff --git a/meta/recipes-support/icu/icu_58.2.bb b/meta/recipes-support/icu/icu_58.2.bb index 4d062ebf94..47684a6c8b 100644 --- a/meta/recipes-support/icu/icu_58.2.bb +++ b/meta/recipes-support/icu/icu_58.2.bb | |||
@@ -16,7 +16,8 @@ BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-${ICU_PV | |||
16 | SRC_URI = "${BASE_SRC_URI} \ | 16 | SRC_URI = "${BASE_SRC_URI} \ |
17 | file://icu-pkgdata-large-cmd.patch \ | 17 | file://icu-pkgdata-large-cmd.patch \ |
18 | file://fix-install-manx.patch \ | 18 | file://fix-install-manx.patch \ |
19 | " | 19 | file://0001-i18n-Drop-include-xlocale.h.patch \ |
20 | " | ||
20 | 21 | ||
21 | SRC_URI_append_class-target = "\ | 22 | SRC_URI_append_class-target = "\ |
22 | file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ | 23 | file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ |