diff options
author | Khem Raj <raj.khem@gmail.com> | 2016-04-03 06:23:06 +0000 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2016-04-03 06:23:06 +0000 |
commit | 9b78ead15b8e64db1b3e6316243a81f153491bca (patch) | |
tree | 4893bad25227351e3b7d1dc9ad98013487d2fae1 | |
parent | 7db85bb2485dacf30816c2ec2b71db5a7463202c (diff) | |
download | meta-clang-9b78ead15b8e64db1b3e6316243a81f153491bca.tar.gz |
libcxxabi: Fix build with glibc
avoid conflicting definitions of MB_LEN_MAX
from limit.h from clang and stdlib.h from glibc
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | recipes-devtools/clang/libcxxabi/0001-include-stdlib.h-earlier-to-avoid-limit.h-defining-M.patch | 34 | ||||
-rw-r--r-- | recipes-devtools/clang/libcxxabi_git.bb | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/recipes-devtools/clang/libcxxabi/0001-include-stdlib.h-earlier-to-avoid-limit.h-defining-M.patch b/recipes-devtools/clang/libcxxabi/0001-include-stdlib.h-earlier-to-avoid-limit.h-defining-M.patch new file mode 100644 index 0000000..3f0a113 --- /dev/null +++ b/recipes-devtools/clang/libcxxabi/0001-include-stdlib.h-earlier-to-avoid-limit.h-defining-M.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From a4e834ab2b1f35f9804b5d97cecebb8bf4a78c81 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 3 Apr 2016 05:36:50 +0000 | ||
4 | Subject: [PATCH] include stdlib.h earlier to avoid limit.h defining MB_LEN_MAX | ||
5 | |||
6 | see | ||
7 | https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=564610 | ||
8 | we have same issue | ||
9 | |||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | src/cxa_demangle.cpp | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/src/cxa_demangle.cpp b/src/cxa_demangle.cpp | ||
16 | index f7b6603..d1ce95a 100644 | ||
17 | --- a/src/cxa_demangle.cpp | ||
18 | +++ b/src/cxa_demangle.cpp | ||
19 | @@ -12,11 +12,11 @@ | ||
20 | |||
21 | #include "__cxxabi_config.h" | ||
22 | |||
23 | +#include <cstdlib> | ||
24 | #include <vector> | ||
25 | #include <algorithm> | ||
26 | #include <string> | ||
27 | #include <numeric> | ||
28 | -#include <cstdlib> | ||
29 | #include <cstring> | ||
30 | #include <cctype> | ||
31 | |||
32 | -- | ||
33 | 1.9.1 | ||
34 | |||
diff --git a/recipes-devtools/clang/libcxxabi_git.bb b/recipes-devtools/clang/libcxxabi_git.bb index 092e3e5..c4fb840 100644 --- a/recipes-devtools/clang/libcxxabi_git.bb +++ b/recipes-devtools/clang/libcxxabi_git.bb | |||
@@ -22,6 +22,7 @@ SRC_URI = "\ | |||
22 | ${LLVM_GIT}/libcxx.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=libcxx;destsuffix=git/projects/libcxx \ | 22 | ${LLVM_GIT}/libcxx.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=libcxx;destsuffix=git/projects/libcxx \ |
23 | ${LLVM_GIT}/libcxxabi.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=libcxxabi;destsuffix=git/projects/libcxxabi \ | 23 | ${LLVM_GIT}/libcxxabi.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=libcxxabi;destsuffix=git/projects/libcxxabi \ |
24 | file://0001-Do-not-use-LIBCXXABI_ARM_EHABI.patch \ | 24 | file://0001-Do-not-use-LIBCXXABI_ARM_EHABI.patch \ |
25 | file://0001-include-stdlib.h-earlier-to-avoid-limit.h-defining-M.patch \ | ||
25 | " | 26 | " |
26 | 27 | ||
27 | SRCREV_FORMAT = "llvm_libcxx_libcxxabi" | 28 | SRCREV_FORMAT = "llvm_libcxx_libcxxabi" |