From 5a33935e8bb34e392913234b3251d26949b29bcb Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 5 Apr 2016 04:39:20 +0000 Subject: clang-runtime: Enable shared libraries package libcxxabi-dev and compiler-rt-staticdev into packagegroup-core-standalone-sdk-target so it gets into SDK Signed-off-by: Khem Raj --- .../packagegroups/packagegroup-core-standalone-sdk-target.bbappend | 2 ++ recipes-devtools/clang/compiler-rt_git.bb | 2 +- recipes-devtools/clang/libcxx_git.bb | 4 ++-- recipes-devtools/clang/libcxxabi_git.bb | 5 ++--- recipes-devtools/clang/llvm-libunwind_git.bb | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend b/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend index bee997a..c8c436d 100644 --- a/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend +++ b/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend @@ -1,5 +1,7 @@ RDEPENDS_${PN} += "\ libcxx-dev \ + libcxxabi-dev \ compiler-rt-dev \ + compiler-rt-staticdev \ llvm-libunwind-dev \ " diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb index 17229b1..c796224 100644 --- a/recipes-devtools/clang/compiler-rt_git.bb +++ b/recipes-devtools/clang/compiler-rt_git.bb @@ -27,7 +27,7 @@ S = "${WORKDIR}/git" inherit cmake pkgconfig pythonnative THUMB_TUNE_CCARGS = "" -TUNE_CCARGS += "-nostdlib" +#TUNE_CCARGS += "-nostdlib" EXTRA_OECMAKE += "-DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON \ -DCOMPILER_RT_BUILD_SANITIZERS=ON \ diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb index 39013bb..3ebb062 100644 --- a/recipes-devtools/clang/libcxx_git.bb +++ b/recipes-devtools/clang/libcxx_git.bb @@ -30,12 +30,12 @@ SRCREV_FORMAT = "llvm_libcxx_libcxxabi" S = "${WORKDIR}/git/projects/libcxx" THUMB_TUNE_CCARGS = "" -TUNE_CCARGS += "-nostdlib" +#TUNE_CCARGS += "-nostdlib" EXTRA_OECMAKE += "-DLIBCXX_CXX_ABI=libcxxabi \ -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${S}/../libcxxabi/include \ -DLLVM_PATH=${S}/../../ \ - -DLIBCXX_ENABLE_SHARED=False \ + -DLIBCXX_ENABLE_SHARED=ON \ " EXTRA_OECMAKE_append_libc-musl = " -DLIBCXX_HAS_MUSL_LIBC=True " diff --git a/recipes-devtools/clang/libcxxabi_git.bb b/recipes-devtools/clang/libcxxabi_git.bb index 6c647e0..1e61675 100644 --- a/recipes-devtools/clang/libcxxabi_git.bb +++ b/recipes-devtools/clang/libcxxabi_git.bb @@ -29,14 +29,13 @@ SRCREV_FORMAT = "llvm_libcxx_libcxxabi" S = "${WORKDIR}/git/projects/libcxxabi" THUMB_TUNE_CCARGS = "" -#TUNE_CCARGS += "-ffreestanding -nostdlib" -TUNE_CCARGS += "-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 \ + -DLIBCXXABI_ENABLE_SHARED=ON \ " CXXFLAGS_append_libc-musl = " -D_LIBCPP_HAS_MUSL_LIBC " diff --git a/recipes-devtools/clang/llvm-libunwind_git.bb b/recipes-devtools/clang/llvm-libunwind_git.bb index 6736e6c..51bdb06 100644 --- a/recipes-devtools/clang/llvm-libunwind_git.bb +++ b/recipes-devtools/clang/llvm-libunwind_git.bb @@ -32,14 +32,14 @@ SRCREV_FORMAT = "llvm_libcxx_libcxxabi_libunwind" S = "${WORKDIR}/git/projects/libunwind" THUMB_TUNE_CCARGS = "" -TUNE_CCARGS += "-nostdlib" +#TUNE_CCARGS += "-nostdlib" EXTRA_OECMAKE += "-DLIBCXXABI_LIBCXX_PATH=${S}/../libcxxabi \ -DLLVM_PATH=${S}/../../ \ -DLLVM_ENABLE_LIBCXX=True \ -DLLVM_ENABLE_LIBCXXABI=True \ -DLLVM_BUILD_EXTERNAL_COMPILER_RT=True \ - -DLIBCXXABI_ENABLE_SHARED=False \ + -DLIBUNWIND_ENABLE_SHARED=ON \ -DUNIX=True \ " do_configure_prepend () { -- cgit v1.2.3-54-g00ecf