From c1dbc0aa3bc9cc9e51fa00d9cd07b8ab5acf3ce9 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 22 May 2017 18:38:27 -0700 Subject: clang/llvm: Move to upcoming 5.0.0 ( trunk ) release Signed-off-by: Khem Raj --- recipes-devtools/clang/libcxx_git.bb | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'recipes-devtools/clang/libcxx_git.bb') diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb index c6e2dd5..2cbcf62 100644 --- a/recipes-devtools/clang/libcxx_git.bb +++ b/recipes-devtools/clang/libcxx_git.bb @@ -7,6 +7,7 @@ LICENSE = "MIT | NCSA" SECTION = "base" require clang.inc +require common.inc inherit cmake pythonnative PV .= "+git${SRCPV}" @@ -17,27 +18,31 @@ BASEDEPENDS_remove_toolchain-clang_class-target = "llvm-libunwind" BASEDEPENDS_remove_toolchain-clang_class-target = "compiler-rt" -LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=7b3a0e1b99822669d630011defe9bfd9; \ - " +LIC_FILES_CHKSUM = "file://projects/libcxx/LICENSE.TXT;md5=7b3a0e1b99822669d630011defe9bfd9; \ +" SRC_URI = "\ - ${LLVM_GIT}/llvm.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=llvm \ - ${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=cxxabi;destsuffix=git/projects/libcxxabi \ - " -SRC_URI_append_libc-musl = " file://0001-use-constexpr-when-using-glibc.patch " + ${LLVM_GIT}/llvm.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=llvm \ + ${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=cxxabi;destsuffix=git/projects/libcxxabi \ + ${LLVMPATCHES} \ + ${LIBCXXPATCHES} \ + ${LIBCXXABIPATCHES} \ +" SRCREV_FORMAT = "llvm_libcxx_cxxabi" -S = "${WORKDIR}/git/projects/libcxx" +S = "${WORKDIR}/git" THUMB_TUNE_CCARGS = "" #TUNE_CCARGS += "-nostdlib" EXTRA_OECMAKE += "-DLIBCXX_CXX_ABI=libcxxabi \ - -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${S}/../libcxxabi/include \ - -DLLVM_PATH=${S}/../../ \ + -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${S}/projects/libcxxabi/include \ + -DLLVM_PATH=${S} \ -DLIBCXX_ENABLE_SHARED=ON \ - " + -DLIBCXX_ENABLE_EXCEPTIONS=ON \ + ${S}/projects/libcxx \ +" EXTRA_OECMAKE_append_libc-musl = " -DLIBCXX_HAS_MUSL_LIBC=True " -- cgit v1.2.3-54-g00ecf