clang: Adjust to build master recipes as well

Signed-off-by: Khem Raj <raj.khem@gmail.com>

2 files changed, 23 insertions, 5 deletions

diff --git a/recipes-devtools/clang/clang.inc b/recipes-devtools/clang/clang.inc
index 58ad16c..7f921ac 100644
--- a/recipes-devtools/clang/clang.inc
+++ b/recipes-devtools/clang/clang.inc
@@ -4,7 +4,7 @@ LLVM_DIR = "llvm${LLVM_RELEASE}"
 LLVM_GIT ?= "git://github.com/llvm-mirror"
 LLVM_GIT_PROTOCOL ?= "git"
 
-PV ?= "3.8.0"
+PV = "3.8.0"
 BRANCH ?= "release_38"
 SRCREV_llvm ?= "06cf4b238fa45638ed37ec7725d38930fea37ff9"
 SRCREV_clang ?= "9fd77bd68130d9b2fbc56a3138b6f981d560480a"
@@ -12,3 +12,21 @@ SRCREV_compiler-rt ?= "31769223eb782e7b03655810d00dfdec66467d51"
 SRCREV_libcxxabi ?= "8d4e51dd9c743b66c8dd552f0632174e04af4052"
 SRCREV_libcxx ?= "fda3549c01ea0a1d2ee00fe0033c35dc36796fc8"
 SRCREV_libunwind ?= "25647b29dd78196ed3c883392ebb339265aeb355"
+
+LLVMMD5SUM ?= "4c0bc17c954e99fd547528d938832bfa"
+CLANGMD5SUM ?= "82ed8fe1976ca709bbd81f4f10a48ccd"
+
+#
+# Uncomment below to enable master version of clang/llvm
+#
+
+#PV = "3.9.0"
+#BRANCH = "master"
+#SRCREV_llvm = "${AUTOREV}"
+#SRCREV_clang = "${AUTOREV}"
+#SRCREV_compiler-rt = "${AUTOREV}"
+#SRCREV_libcxxabi = "${AUTOREV}"
+#SRCREV_libcxx = "${AUTOREV}"
+#SRCREV_libunwind = "${AUTOREV}"
+#LLVMMD5SUM = "43fdaa303c1c5589ad60f4ffc6a0b9ce"
+#CLANGMD5SUM = "a77eac638a3aae44a2d604217d6f0f01"
diff --git a/recipes-devtools/clang/clang_git.bb b/recipes-devtools/clang/clang_git.bb
index f05bc98..163953e 100644
--- a/recipes-devtools/clang/clang_git.bb
+++ b/recipes-devtools/clang/clang_git.bb
@@ -10,8 +10,8 @@ require clang.inc
 
 PV .= "+git${SRCPV}"
 
-LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=4c0bc17c954e99fd547528d938832bfa; \
-                    file://tools/clang/LICENSE.TXT;md5=82ed8fe1976ca709bbd81f4f10a48ccd; \
+LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=${LLVMMD5SUM}; \
+                    file://tools/clang/LICENSE.TXT;md5=${CLANGMD5SUM}; \
                    "
 SRC_URI = "${LLVM_GIT}/llvm.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=llvm \
            ${LLVM_GIT}/clang.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};destsuffix=git/tools/clang;name=clang \
@@ -87,9 +87,9 @@ DEPENDS_append_class-nativesdk = " clang-native "
 
 do_configure_prepend() {
         # Remove RPATHs
-        sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' ${S}/Makefile.rules
+#       sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' ${S}/Makefile.rules
         # Drop "svn" suffix from version string
-        sed -i 's/${PV}svn/${PV}/g' ${S}/configure
+#       sed -i 's/${PV}svn/${PV}/g' ${S}/configure
 
         # Fix paths in llvm-config
         sed -i "s|sys::path::parent_path(CurrentPath))\.str()|sys::path::parent_path(sys::path::parent_path(CurrentPath))).str()|g" ${S}/tools/llvm-config/llvm-config.cpp