1 files changed, 82 insertions, 0 deletions

diff --git a/recipes-devtools/clang/clang/0035-Drop-the-git-suffix-from-various-version-variables.patch b/recipes-devtools/clang/clang/0035-Drop-the-git-suffix-from-various-version-variables.patch
new file mode 100644
index 0000000..3ef66d4
--- /dev/null
+++ b/recipes-devtools/clang/clang/0035-Drop-the-git-suffix-from-various-version-variables.patch
@@ -0,0 +1,82 @@
+From ae81bf58c31d5c93190c3dd85a4100b86055193a Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Wed, 23 Jun 2021 16:25:06 +0800
+Subject: [PATCH] Drop the 'git' suffix from various version variables
+
+Upstream-Status: Backport [cherry-picked from branch 12.0.0]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libcxx/CMakeLists.txt                                           | 2 +-
+ libcxxabi/CMakeLists.txt                                        | 2 +-
+ libunwind/CMakeLists.txt                                        | 2 +-
+ llvm/CMakeLists.txt                                             | 2 +-
+ .../llvm-project-overlay/llvm/include/llvm/Config/llvm-config.h | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
+index 06ee1d74a03e..1ead84c19fcb 100644
+--- a/libcxx/CMakeLists.txt
++++ b/libcxx/CMakeLists.txt
+@@ -29,7 +29,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXX_STANDALONE_BUIL
+   project(libcxx CXX C)
+ 
+   set(PACKAGE_NAME libcxx)
+-  set(PACKAGE_VERSION 13.0.0git)
++  set(PACKAGE_VERSION 13.0.0)
+   set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
+   set(PACKAGE_BUGREPORT "llvm-bugs@lists.llvm.org")
+ 
+diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt
+index 6a9ba8ec635d..dcd7b8765de3 100644
+--- a/libcxxabi/CMakeLists.txt
++++ b/libcxxabi/CMakeLists.txt
+@@ -28,7 +28,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXXABI_STANDALONE_B
+   project(libcxxabi CXX C)
+ 
+   set(PACKAGE_NAME libcxxabi)
+-  set(PACKAGE_VERSION 11.0.0git)
++  set(PACKAGE_VERSION 11.0.0)
+   set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
+   set(PACKAGE_BUGREPORT "llvm-bugs@lists.llvm.org")
+ 
+diff --git a/libunwind/CMakeLists.txt b/libunwind/CMakeLists.txt
+index a2c03fd3f8aa..82424253c8da 100644
+--- a/libunwind/CMakeLists.txt
++++ b/libunwind/CMakeLists.txt
+@@ -24,7 +24,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBUNWIND_STANDALONE_B
+   project(libunwind LANGUAGES C CXX ASM)
+ 
+   set(PACKAGE_NAME libunwind)
+-  set(PACKAGE_VERSION 13.0.0git)
++  set(PACKAGE_VERSION 13.0.0)
+   set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
+   set(PACKAGE_BUGREPORT "llvm-bugs@lists.llvm.org")
+ 
+diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
+index 5d3ad7a4fd58..796b47a3d554 100644
+--- a/llvm/CMakeLists.txt
++++ b/llvm/CMakeLists.txt
+@@ -20,7 +20,7 @@ if(NOT DEFINED LLVM_VERSION_PATCH)
+   set(LLVM_VERSION_PATCH 0)
+ endif()
+ if(NOT DEFINED LLVM_VERSION_SUFFIX)
+-  set(LLVM_VERSION_SUFFIX git)
++  set(LLVM_VERSION_SUFFIX "")
+ endif()
+ 
+ if (NOT PACKAGE_VERSION)
+diff --git a/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/llvm-config.h b/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/llvm-config.h
+index ba85df023ae6..f19c22ad13c0 100644
+--- a/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/llvm-config.h
++++ b/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/llvm-config.h
+@@ -80,7 +80,7 @@
+ #define LLVM_VERSION_PATCH 0
+ 
+ /* LLVM version string */
+-#define LLVM_VERSION_STRING "13.0.0git"
++#define LLVM_VERSION_STRING "13.0.0"
+ 
+ /* Whether LLVM records statistics for use with GetStatistics(),
+  * PrintStatistics() or PrintStatisticsJSON()