diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2017-06-24 22:55:03 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-06 14:38:07 +0100 |
| commit | 8906f4dd8e47dbe075125767390f4351a81ae571 (patch) | |
| tree | c420d00bf470c9c9cb27e59588baf68e7f0e6a84 /meta/recipes-support | |
| parent | 8d3bd6fbf748ad6f67bb2e86854d15f99a07bf87 (diff) | |
| download | openembedded-core-8906f4dd8e47dbe075125767390f4351a81ae571.tar.gz | |
icu: Fix build with glibc 2.26
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-support')
| -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 @@ +From c4254fd8ff1888ca285e3242b812010357ce2b3e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 24 Jun 2017 22:52:40 -0700 +Subject: [PATCH] i18n: Drop include <xlocale.h> + +glibc 2.26 drops this header + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + i18n/digitlst.cpp | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +Index: source/i18n/digitlst.cpp +=================================================================== +--- source.orig/i18n/digitlst.cpp ++++ source/i18n/digitlst.cpp +@@ -61,11 +61,7 @@ + #endif + + #if U_USE_STRTOD_L +-# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN +-# include <locale.h> +-# else +-# include <xlocale.h> +-# endif ++# include <locale.h> + #endif + + // *************************************************************************** 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 SRC_URI = "${BASE_SRC_URI} \ file://icu-pkgdata-large-cmd.patch \ file://fix-install-manx.patch \ - " + file://0001-i18n-Drop-include-xlocale.h.patch \ + " SRC_URI_append_class-target = "\ file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ |