clang: Fix SRCREV_FOTMAT clashes due to same substr in names

When we use same substr in two SRC_URI name= arguments e.g.
name=libcxx and name=libcxxabi then bitbake replaces the substring
in SRCREV_FORMAT in literal form like SRCREV_FORMAT = "xxx_xxxabi"
which is not correct and it confuses the workdir completely

see

lib/bb/fetch2/__init__.py#L772

where bitbake is using replace() python API which will replace
the match and not exact match

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

4 files changed, 7 insertions, 7 deletions

diff --git a/recipes-devtools/clang/clang.inc b/recipes-devtools/clang/clang.inc
index ace8291..db14d3f 100644
--- a/recipes-devtools/clang/clang.inc
+++ b/recipes-devtools/clang/clang.inc
@@ -13,7 +13,7 @@ BRANCH = "master"
 SRCREV_llvm = "2a09a5fe752117113500a8353c80ad5a7105e6f2"
 SRCREV_clang = "700e6a514a37a0eb2f26c27baf33163ad07f5b15"
 SRCREV_compiler-rt = "3e3f7da05ecff5798c252a3bba17138ffb636fcf"
-SRCREV_libcxxabi = "5328c6b635a145efc1204ad25341706fb705e346"
+SRCREV_cxxabi = "5328c6b635a145efc1204ad25341706fb705e346"
 SRCREV_libcxx = "576639133af7bd202a285117818a5575d356e3be"
 SRCREV_libunwind = "878c40b2f240ee9f57be7dce86caf7650f79dc7f"
 
diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb
index 570c90b..bc94b38 100644
--- a/recipes-devtools/clang/libcxx_git.bb
+++ b/recipes-devtools/clang/libcxx_git.bb
@@ -21,11 +21,11 @@ LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=19a8c2f1fc295558b4e55b076321d5f4; \
 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=libcxxabi;destsuffix=git/projects/libcxxabi \
+           ${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 "
 
-SRCREV_FORMAT = "llvm_libcxx_libcxxabi"
+SRCREV_FORMAT = "llvm_libcxx_cxxabi"
 
 S = "${WORKDIR}/git/projects/libcxx"
 
diff --git a/recipes-devtools/clang/libcxxabi_git.bb b/recipes-devtools/clang/libcxxabi_git.bb
index 1f83420..a7912fa 100644
--- a/recipes-devtools/clang/libcxxabi_git.bb
+++ b/recipes-devtools/clang/libcxxabi_git.bb
@@ -20,11 +20,11 @@ LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=d0e0873d07a25650544fb86c75a572d8; \
 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=libcxxabi;destsuffix=git/projects/libcxxabi \
+           ${LLVM_GIT}/libcxxabi.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=cxxabi;destsuffix=git/projects/libcxxabi \
            file://0001-Do-not-use-LIBCXXABI_ARM_EHABI.patch \
 "
 
-SRCREV_FORMAT = "llvm_libcxx_libcxxabi"
+SRCREV_FORMAT = "llvm_libcxx_cxxabi"
 
 S = "${WORKDIR}/git/projects/libcxxabi"
 
diff --git a/recipes-devtools/clang/llvm-libunwind_git.bb b/recipes-devtools/clang/llvm-libunwind_git.bb
index 23389aa..fc5f499 100644
--- a/recipes-devtools/clang/llvm-libunwind_git.bb
+++ b/recipes-devtools/clang/llvm-libunwind_git.bb
@@ -22,11 +22,11 @@ LIC_FILES_CHKSUM = "file://../libcxx/LICENSE.TXT;md5=19a8c2f1fc295558b4e55b07632
 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=libcxxabi;destsuffix=git/projects/libcxxabi \
+           ${LLVM_GIT}/libcxxabi.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=cxxabi;destsuffix=git/projects/libcxxabi \
            ${LLVM_GIT}/libunwind.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=libunwind;destsuffix=git/projects/libunwind \
           "
 
-SRCREV_FORMAT = "llvm_libcxx_libcxxabi_libunwind"
+SRCREV_FORMAT = "llvm_libcxx_cxxabi_libunwind"
 
 S = "${WORKDIR}/git/projects/libunwind"