summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-04-04 02:21:11 +0000
committerKhem Raj <raj.khem@gmail.com>2016-04-04 02:21:11 +0000
commit1cac07eb0657e88da2bb9e7ff026bdbee6556929 (patch)
tree89b4cd9e461f88252c9e39d522127cd2980190e9
parentce97db12b13754c4baee474076169f831d49b0c1 (diff)
downloadmeta-clang-1cac07eb0657e88da2bb9e7ff026bdbee6556929.tar.gz
libcxxabi: Remove workaround to order limit.h and stdlib.h
Real isue is use of -ffreestanding, we need to remove that we are targetting linux so its hosted Correct dual lincese logic Fix formatting to match recommended OE style 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.patch34
-rw-r--r--recipes-devtools/clang/libcxxabi_git.bb13
2 files changed, 6 insertions, 41 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
deleted file mode 100644
index 3f0a113..0000000
--- a/recipes-devtools/clang/libcxxabi/0001-include-stdlib.h-earlier-to-avoid-limit.h-defining-M.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From a4e834ab2b1f35f9804b5d97cecebb8bf4a78c81 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 3 Apr 2016 05:36:50 +0000
4Subject: [PATCH] include stdlib.h earlier to avoid limit.h defining MB_LEN_MAX
5
6see
7https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=564610
8we have same issue
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 src/cxa_demangle.cpp | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/src/cxa_demangle.cpp b/src/cxa_demangle.cpp
16index 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--
331.9.1
34
diff --git a/recipes-devtools/clang/libcxxabi_git.bb b/recipes-devtools/clang/libcxxabi_git.bb
index c4fb840..9353ee2 100644
--- a/recipes-devtools/clang/libcxxabi_git.bb
+++ b/recipes-devtools/clang/libcxxabi_git.bb
@@ -2,8 +2,8 @@
2# Released under the MIT license (see COPYING.MIT for the terms) 2# Released under the MIT license (see COPYING.MIT for the terms)
3 3
4DESCRIPTION = "libc++ is a new implementation of the C++ standard library, targeting C++11" 4DESCRIPTION = "libc++ is a new implementation of the C++ standard library, targeting C++11"
5HOMEPAGE = "http://libcxx.llvm.org/" 5HOMEPAGE = "http://libcxxabi.llvm.org/"
6LICENSE = "MIT & NSCA" 6LICENSE = "MIT | NCSA"
7SECTION = "base" 7SECTION = "base"
8INHIBIT_DEFAULT_DEPS = "1" 8INHIBIT_DEFAULT_DEPS = "1"
9 9
@@ -22,23 +22,22 @@ 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 "
27 26
28SRCREV_FORMAT = "llvm_libcxx_libcxxabi" 27SRCREV_FORMAT = "llvm_libcxx_libcxxabi"
29 28
30S = "${WORKDIR}/git/projects/libcxxabi" 29S = "${WORKDIR}/git/projects/libcxxabi"
31 30
32THUMB_TUNE_CCARGS = "" 31THUMB_TUNE_CCARGS = ""
33TUNE_CCARGS += "-ffreestanding -nostdlib" 32#TUNE_CCARGS += "-ffreestanding -nostdlib"
34 33TUNE_CCARGS += "-nostdlib"
35EXTRA_OECMAKE += "-DLIBCXXABI_LIBCXX_PATH=${S}/../libcxx \ 34EXTRA_OECMAKE += "-DLIBCXXABI_LIBCXX_PATH=${S}/../libcxx \
36 -DLLVM_PATH=${S}/../../ \ 35 -DLLVM_PATH=${S}/../../ \
37 -DLLVM_ENABLE_LIBCXX=True \ 36 -DLLVM_ENABLE_LIBCXX=True \
38 -DLIBCXXABI_LIBCXX_INCLUDES=${S}/../libcxx/include \ 37 -DLIBCXXABI_LIBCXX_INCLUDES=${S}/../libcxx/include \
39 -DLLVM_BUILD_EXTERNAL_COMPILER_RT=True \ 38 -DLLVM_BUILD_EXTERNAL_COMPILER_RT=True \
40 -DLIBCXXABI_ENABLE_SHARED=False \ 39 -DLIBCXXABI_ENABLE_SHARED=False \
41 " 40"
42CXXFLAGS_append_libc-musl = " -D_LIBCPP_HAS_MUSL_LIBC " 41CXXFLAGS_append_libc-musl = " -D_LIBCPP_HAS_MUSL_LIBC "
43 42
44BBCLASSEXTEND = "native nativesdk" 43BBCLASSEXTEND = "native nativesdk"