From 13ec20a3c20f0045f593e1b9a37ccc7f45d1581c Mon Sep 17 00:00:00 2001 From: Yi Qingliang Date: Mon, 29 Feb 2016 16:09:23 +0000 Subject: use variable 'CLANG_GIT' and 'CLANG_GIT_PROTOCOL' Signed-off-by: Yi Qingliang --- recipes-devtools/clang/clang.inc | 3 +++ recipes-devtools/clang/clang_git.bb | 4 ++-- recipes-devtools/clang/compiler-rt_git.bb | 2 +- recipes-devtools/clang/libcxx_git.bb | 6 +++--- recipes-devtools/clang/libcxxabi_git.bb | 6 +++--- recipes-devtools/clang/llvm-libunwind_git.bb | 8 ++++---- 6 files changed, 16 insertions(+), 13 deletions(-) diff --git a/recipes-devtools/clang/clang.inc b/recipes-devtools/clang/clang.inc index ab29781..30cf688 100644 --- a/recipes-devtools/clang/clang.inc +++ b/recipes-devtools/clang/clang.inc @@ -2,6 +2,9 @@ PV = "3.8.0" LLVM_RELEASE = "" LLVM_DIR = "llvm${LLVM_RELEASE}" +CLANG_GIT ?= "git://github.com/llvm-mirror" +CLANG_GIT_PROTOCOL ?= "git" + BRANCH = "release_38" SRCREV_llvm = "27c964e2ae0b573cf1e6551a3da255539db03d3c" SRCREV_clang = "b98cd9d6a300bcd4863a26786bb1b5d782dcecc0" diff --git a/recipes-devtools/clang/clang_git.bb b/recipes-devtools/clang/clang_git.bb index 814709f..68993df 100644 --- a/recipes-devtools/clang/clang_git.bb +++ b/recipes-devtools/clang/clang_git.bb @@ -13,8 +13,8 @@ PV .= "+git${SRCPV}" LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=4c0bc17c954e99fd547528d938832bfa; \ file://tools/clang/LICENSE.TXT;md5=82ed8fe1976ca709bbd81f4f10a48ccd; \ " -SRC_URI = "git://github.com/llvm-mirror/llvm.git;branch=${BRANCH};name=llvm \ - git://github.com/llvm-mirror/clang.git;branch=${BRANCH};destsuffix=git/tools/clang;name=clang \ +SRC_URI = "${CLANG_GIT}/llvm.git;protocol=${CLANG_GIT_PROTOCOL};branch=${BRANCH};name=llvm \ + ${CLANG_GIT}/clang.git;protocol=${CLANG_GIT_PROTOCOL};branch=${BRANCH};destsuffix=git/tools/clang;name=clang \ file://0001-Remove-CMAKE_CROSSCOMPILING-so-it-can-cross-compile.patch \ " diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb index 4fa7cf6..d11d010 100644 --- a/recipes-devtools/clang/compiler-rt_git.bb +++ b/recipes-devtools/clang/compiler-rt_git.bb @@ -14,7 +14,7 @@ PV .= "+git${SRCPV}" LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=27b14ab4ce08d04c3a9a5f0ed7997362; \ " -SRC_URI = "git://github.com/llvm-mirror/compiler-rt.git;branch=${BRANCH};name=compiler-rt \ +SRC_URI = "${CLANG_GIT}/compiler-rt.git;protocol=${CLANG_GIT_PROTOCOL};branch=${BRANCH};name=compiler-rt \ file://0001-support-a-new-embedded-linux-target.patch \ " diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb index 69d6dfd..1056781 100644 --- a/recipes-devtools/clang/libcxx_git.bb +++ b/recipes-devtools/clang/libcxx_git.bb @@ -19,9 +19,9 @@ DEPENDS += "libcxxabi" LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=149d2e8e8d99e3a2d702997b5f919fd9; \ " SRC_URI = "\ - git://github.com/llvm-mirror/llvm.git;branch=${BRANCH};name=llvm \ - git://github.com/llvm-mirror/libcxx.git;branch=${BRANCH};name=libcxx;destsuffix=git/projects/libcxx \ - git://github.com/llvm-mirror/libcxxabi.git;branch=${BRANCH};name=libcxxabi;destsuffix=git/projects/libcxxabi \ + ${CLANG_GIT}/llvm.git;protocol=${CLANG_GIT_PROTOCOL};branch=${BRANCH};name=llvm \ + ${CLANG_GIT}/libcxx.git;protocol=${CLANG_GIT_PROTOCOL};branch=${BRANCH};name=libcxx;destsuffix=git/projects/libcxx \ + ${CLANG_GIT}/libcxxabi.git;protocol=${CLANG_GIT_PROTOCOL};branch=${BRANCH};name=libcxxabi;destsuffix=git/projects/libcxxabi \ " SRCREV_FORMAT = "llvm_libcxx_libcxxabi" diff --git a/recipes-devtools/clang/libcxxabi_git.bb b/recipes-devtools/clang/libcxxabi_git.bb index 67b4341..f1f5c27 100644 --- a/recipes-devtools/clang/libcxxabi_git.bb +++ b/recipes-devtools/clang/libcxxabi_git.bb @@ -18,9 +18,9 @@ DEPENDS += "compiler-rt" LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=9041c9f38eb0f718f408e28ce138bb9a; \ " SRC_URI = "\ - git://github.com/llvm-mirror/llvm.git;branch=${BRANCH};name=llvm \ - git://github.com/llvm-mirror/libcxx.git;branch=${BRANCH};name=libcxx;destsuffix=git/projects/libcxx \ - git://github.com/llvm-mirror/libcxxabi.git;branch=${BRANCH};name=libcxxabi;destsuffix=git/projects/libcxxabi \ + ${CLANG_GIT}/llvm.git;protocol=${CLANG_GIT_PROTOCOL};branch=${BRANCH};name=llvm \ + ${CLANG_GIT}/libcxx.git;protocol=${CLANG_GIT_PROTOCOL};branch=${BRANCH};name=libcxx;destsuffix=git/projects/libcxx \ + ${CLANG_GIT}/libcxxabi.git;protocol=${CLANG_GIT_PROTOCOL};branch=${BRANCH};name=libcxxabi;destsuffix=git/projects/libcxxabi \ " SRCREV_FORMAT = "llvm_libcxx_libcxxabi" diff --git a/recipes-devtools/clang/llvm-libunwind_git.bb b/recipes-devtools/clang/llvm-libunwind_git.bb index c11523a..db11c94 100644 --- a/recipes-devtools/clang/llvm-libunwind_git.bb +++ b/recipes-devtools/clang/llvm-libunwind_git.bb @@ -20,10 +20,10 @@ PROVIDES += "libunwind" LIC_FILES_CHKSUM = "file://../libcxx/LICENSE.TXT;md5=149d2e8e8d99e3a2d702997b5f919fd9; \ " SRC_URI = "\ - git://github.com/llvm-mirror/llvm.git;branch=${BRANCH};name=llvm \ - git://github.com/llvm-mirror/libcxx.git;branch=${BRANCH};name=libcxx;destsuffix=git/projects/libcxx \ - git://github.com/llvm-mirror/libcxxabi.git;branch=${BRANCH};name=libcxxabi;destsuffix=git/projects/libcxxabi \ - git://github.com/llvm-mirror/libunwind.git;branch=${BRANCH};name=libunwind;destsuffix=git/projects/libunwind \ + ${CLANG_GIT}/llvm.git;protocol=${CLANG_GIT_PROTOCOL};branch=${BRANCH};name=llvm \ + ${CLANG_GIT}/libcxx.git;protocol=${CLANG_GIT_PROTOCOL};branch=${BRANCH};name=libcxx;destsuffix=git/projects/libcxx \ + ${CLANG_GIT}/libcxxabi.git;protocol=${CLANG_GIT_PROTOCOL};branch=${BRANCH};name=libcxxabi;destsuffix=git/projects/libcxxabi \ + ${CLANG_GIT}/libunwind.git;protocol=${CLANG_GIT_PROTOCOL};branch=${BRANCH};name=libunwind;destsuffix=git/projects/libunwind \ file://0001-aarch64-Use-x29-and-x30-for-fp-and-lr-respectively.patch \ " -- cgit v1.2.3-54-g00ecf