summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-06-24 22:55:03 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-06 14:38:14 +0100
commit931430f94c018bc3f58d70e11ca4a4ae7cb2e19c (patch)
treeb02caf947e807a3a8f620d8ceef6947f580cf17f /meta
parentd9a1adbb48c969cc6f3d50ad254542a9e498b0c4 (diff)
downloadpoky-931430f94c018bc3f58d70e11ca4a4ae7cb2e19c.tar.gz
icu: Fix build with glibc 2.26
(From OE-Core rev: 8906f4dd8e47dbe075125767390f4351a81ae571) 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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch31
-rw-r--r--meta/recipes-support/icu/icu_58.2.bb3
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 @@
1From c4254fd8ff1888ca285e3242b812010357ce2b3e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 24 Jun 2017 22:52:40 -0700
4Subject: [PATCH] i18n: Drop include <xlocale.h>
5
6glibc 2.26 drops this header
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10Upstream-Status: Pending
11
12 i18n/digitlst.cpp | 6 +-----
13 1 file changed, 1 insertion(+), 5 deletions(-)
14
15Index: 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
16SRC_URI = "${BASE_SRC_URI} \ 16SRC_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
21SRC_URI_append_class-target = "\ 22SRC_URI_append_class-target = "\
22 file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ 23 file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \