From 1cac07eb0657e88da2bb9e7ff026bdbee6556929 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 4 Apr 2016 02:21:11 +0000 Subject: 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 --- ...lib.h-earlier-to-avoid-limit.h-defining-M.patch | 34 ---------------------- recipes-devtools/clang/libcxxabi_git.bb | 13 ++++----- 2 files changed, 6 insertions(+), 41 deletions(-) delete mode 100644 recipes-devtools/clang/libcxxabi/0001-include-stdlib.h-earlier-to-avoid-limit.h-defining-M.patch 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 @@ -From a4e834ab2b1f35f9804b5d97cecebb8bf4a78c81 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 3 Apr 2016 05:36:50 +0000 -Subject: [PATCH] include stdlib.h earlier to avoid limit.h defining MB_LEN_MAX - -see -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=564610 -we have same issue - -Signed-off-by: Khem Raj ---- - src/cxa_demangle.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/cxa_demangle.cpp b/src/cxa_demangle.cpp -index f7b6603..d1ce95a 100644 ---- a/src/cxa_demangle.cpp -+++ b/src/cxa_demangle.cpp -@@ -12,11 +12,11 @@ - - #include "__cxxabi_config.h" - -+#include - #include - #include - #include - #include --#include - #include - #include - --- -1.9.1 - 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 @@ # Released under the MIT license (see COPYING.MIT for the terms) DESCRIPTION = "libc++ is a new implementation of the C++ standard library, targeting C++11" -HOMEPAGE = "http://libcxx.llvm.org/" -LICENSE = "MIT & NSCA" +HOMEPAGE = "http://libcxxabi.llvm.org/" +LICENSE = "MIT | NCSA" SECTION = "base" INHIBIT_DEFAULT_DEPS = "1" @@ -22,23 +22,22 @@ SRC_URI = "\ ${LLVM_GIT}/libcxx.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=libcxx;destsuffix=git/projects/libcxx \ ${LLVM_GIT}/libcxxabi.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=libcxxabi;destsuffix=git/projects/libcxxabi \ file://0001-Do-not-use-LIBCXXABI_ARM_EHABI.patch \ - file://0001-include-stdlib.h-earlier-to-avoid-limit.h-defining-M.patch \ - " +" SRCREV_FORMAT = "llvm_libcxx_libcxxabi" S = "${WORKDIR}/git/projects/libcxxabi" THUMB_TUNE_CCARGS = "" -TUNE_CCARGS += "-ffreestanding -nostdlib" - +#TUNE_CCARGS += "-ffreestanding -nostdlib" +TUNE_CCARGS += "-nostdlib" EXTRA_OECMAKE += "-DLIBCXXABI_LIBCXX_PATH=${S}/../libcxx \ -DLLVM_PATH=${S}/../../ \ -DLLVM_ENABLE_LIBCXX=True \ -DLIBCXXABI_LIBCXX_INCLUDES=${S}/../libcxx/include \ -DLLVM_BUILD_EXTERNAL_COMPILER_RT=True \ -DLIBCXXABI_ENABLE_SHARED=False \ - " +" CXXFLAGS_append_libc-musl = " -D_LIBCPP_HAS_MUSL_LIBC " BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf