diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-07-20 13:08:11 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2017-07-20 13:08:11 -0700 |
commit | 81507c024e6904054831ed766416ea831f9b9744 (patch) | |
tree | a0cbcade34c7f0339056b7e44e9f43a339c4dca4 /recipes-devtools | |
parent | e688e5f2061b2587fd2d0f3b44ea3cd0549e2a25 (diff) | |
download | meta-clang-81507c024e6904054831ed766416ea831f9b9744.tar.gz |
libcxx: Do not include xlocale.h
Thsi file is removed from glibc >= 2.26
Fixes #36
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes-devtools')
-rw-r--r-- | recipes-devtools/clang/clang/0002-libcxx-Do-not-include-xlocale.h-on-glibc.patch | 30 | ||||
-rw-r--r-- | recipes-devtools/clang/common.inc | 1 |
2 files changed, 31 insertions, 0 deletions
diff --git a/recipes-devtools/clang/clang/0002-libcxx-Do-not-include-xlocale.h-on-glibc.patch b/recipes-devtools/clang/clang/0002-libcxx-Do-not-include-xlocale.h-on-glibc.patch new file mode 100644 index 0000000..ed48ec0 --- /dev/null +++ b/recipes-devtools/clang/clang/0002-libcxx-Do-not-include-xlocale.h-on-glibc.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From 906b5542f9b2c608ae1782b1c1c2dcd710fb84c8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 20 Jul 2017 12:58:30 -0700 | ||
4 | Subject: [PATCH] libcxx: Do not include xlocale.h on glibc | ||
5 | |||
6 | xlocale.h has been removed from glibc 2.26 | ||
7 | see | ||
8 | https://sourceware.org/glibc/wiki/Release/2.26#Packaging_Changes | ||
9 | |||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | include/__locale | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/include/__locale b/include/__locale | ||
16 | index 766842294..91ed9e709 100644 | ||
17 | --- a/include/__locale | ||
18 | +++ b/include/__locale | ||
19 | @@ -34,7 +34,7 @@ | ||
20 | # include <support/solaris/xlocale.h> | ||
21 | #elif defined(_NEWLIB_VERSION) | ||
22 | # include <support/newlib/xlocale.h> | ||
23 | -#elif (defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD__) \ | ||
24 | +#elif (defined(__APPLE__) || defined(__FreeBSD__) \ | ||
25 | || defined(__EMSCRIPTEN__) || defined(__IBMCPP__)) | ||
26 | # include <xlocale.h> | ||
27 | #elif defined(__Fuchsia__) | ||
28 | -- | ||
29 | 2.13.3 | ||
30 | |||
diff --git a/recipes-devtools/clang/common.inc b/recipes-devtools/clang/common.inc index 0f01131..62af42b 100644 --- a/recipes-devtools/clang/common.inc +++ b/recipes-devtools/clang/common.inc | |||
@@ -25,6 +25,7 @@ LIBCXXABIPATCHES ="\ | |||
25 | 25 | ||
26 | # libc++ patches | 26 | # libc++ patches |
27 | LIBCXXPATCHES = "\ | 27 | LIBCXXPATCHES = "\ |
28 | file://0002-libcxx-Do-not-include-xlocale.h-on-glibc.patch;patchdir=projects/libcxx \ | ||
28 | " | 29 | " |
29 | 30 | ||
30 | LIBCXXPATCHES_append_libc-musl = "\ | 31 | LIBCXXPATCHES_append_libc-musl = "\ |