From 3373f255b0bbd1f41d5a5bc4e6ef1f5d7c8ff438 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 22 Aug 2015 12:29:13 -0700 Subject: clang: Move common bits to clang.inc Signed-off-by: Khem Raj --- recipes-devtools/clang/clang.inc | 7 +++++++ recipes-devtools/clang/clang_git.bb | 4 ---- recipes-devtools/clang/compiler-rt_git.bb | 4 ---- recipes-devtools/clang/libcxx_git.bb | 6 ------ recipes-devtools/clang/libcxxabi_git.bb | 6 ------ 5 files changed, 7 insertions(+), 20 deletions(-) diff --git a/recipes-devtools/clang/clang.inc b/recipes-devtools/clang/clang.inc index 1e90133..59d8b97 100644 --- a/recipes-devtools/clang/clang.inc +++ b/recipes-devtools/clang/clang.inc @@ -1,3 +1,10 @@ PV = "3.7.0" LLVM_RELEASE = "" LLVM_DIR = "llvm${LLVM_RELEASE}" + +BRANCH = "release_37" +SRCREV_llvm = "937d48bea8f01b02d5f3db05a9e58dfb976e9d3b" +SRCREV_clang = "0c0116f5826045008e6627967abe0e9320700e2b" +SRCREV_compiler-rt = "b5214093d4c91ed5352d35ee9126665fabfa97fe" +SRCREV_libcxxabi = "8f53d45e9ac7d3c078ab3fe8f91c40a4cc6b579a" +SRCREV_libcxx = "de80a7d886d75188de210eb4d6f0768fdc4d4d0b" diff --git a/recipes-devtools/clang/clang_git.bb b/recipes-devtools/clang/clang_git.bb index 4db61cf..298b0a2 100644 --- a/recipes-devtools/clang/clang_git.bb +++ b/recipes-devtools/clang/clang_git.bb @@ -8,7 +8,6 @@ SECTION = "devel" require clang.inc -BRANCH ?= "release_37" LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=4c0bc17c954e99fd547528d938832bfa; \ file://tools/clang/LICENSE.TXT;md5=82ed8fe1976ca709bbd81f4f10a48ccd; \ " @@ -17,9 +16,6 @@ SRC_URI = "git://github.com/llvm-mirror/llvm.git;branch=${BRANCH};name=llvm \ file://0001-Remove-CMAKE_CROSSCOMPILING-so-it-can-cross-compile.patch \ " -SRCREV_llvm = "937d48bea8f01b02d5f3db05a9e58dfb976e9d3b" -SRCREV_clang = "0c0116f5826045008e6627967abe0e9320700e2b" - SRCREV_FORMAT = "llvm_clang" INHIBIT_DEFAULT_DEPS = "1" diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb index e15d15a..026fcda 100644 --- a/recipes-devtools/clang/compiler-rt_git.bb +++ b/recipes-devtools/clang/compiler-rt_git.bb @@ -11,16 +11,12 @@ DEPENDS += "clang-cross-${TRANSLATED_TARGET_ARCH}" require clang.inc -BRANCH ?= "release_37" - LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=27b14ab4ce08d04c3a9a5f0ed7997362; \ " SRC_URI = "git://github.com/llvm-mirror/compiler-rt.git;branch=${BRANCH};name=compiler-rt \ file://0001-support-a-new-embedded-linux-target.patch \ " -SRCREV_compiler-rt = "b5214093d4c91ed5352d35ee9126665fabfa97fe" - SRCREV_FORMAT = "compiler-rt" S = "${WORKDIR}/git" diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb index 02e5bed..ade249b 100644 --- a/recipes-devtools/clang/libcxx_git.bb +++ b/recipes-devtools/clang/libcxx_git.bb @@ -13,8 +13,6 @@ require clang.inc inherit cmake -BRANCH ?= "release_37" - DEPENDS += "libcxxabi" LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=149d2e8e8d99e3a2d702997b5f919fd9; \ @@ -25,10 +23,6 @@ SRC_URI = "\ git://github.com/llvm-mirror/libcxxabi.git;branch=${BRANCH};name=libcxxabi;destsuffix=git/projects/libcxxabi \ " -SRCREV_libcxxabi = "8f53d45e9ac7d3c078ab3fe8f91c40a4cc6b579a" -SRCREV_libcxx = "de80a7d886d75188de210eb4d6f0768fdc4d4d0b" -SRCREV_llvm = "937d48bea8f01b02d5f3db05a9e58dfb976e9d3b" - SRCREV_FORMAT = "llvm_libcxx_libcxxabi" S = "${WORKDIR}/git/projects/libcxx" diff --git a/recipes-devtools/clang/libcxxabi_git.bb b/recipes-devtools/clang/libcxxabi_git.bb index 5194620..c298d41 100644 --- a/recipes-devtools/clang/libcxxabi_git.bb +++ b/recipes-devtools/clang/libcxxabi_git.bb @@ -13,8 +13,6 @@ require clang.inc inherit cmake -BRANCH ?= "release_37" - DEPENDS += "compiler-rt" LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=9041c9f38eb0f718f408e28ce138bb9a; \ " @@ -24,10 +22,6 @@ SRC_URI = "\ git://github.com/llvm-mirror/libcxxabi.git;branch=${BRANCH};name=libcxxabi;destsuffix=git/projects/libcxxabi \ " -SRCREV_libcxxabi = "8f53d45e9ac7d3c078ab3fe8f91c40a4cc6b579a" -SRCREV_libcxx = "de80a7d886d75188de210eb4d6f0768fdc4d4d0b" -SRCREV_llvm = "937d48bea8f01b02d5f3db05a9e58dfb976e9d3b" - SRCREV_FORMAT = "llvm_libcxx_libcxxabi" S = "${WORKDIR}/git/projects/libcxxabi" -- cgit v1.2.3-54-g00ecf